Merge pull request #4285 from stefansaraev/cosmetics

buildsystem cosmetics
This commit is contained in:
Stephan Raue 2015-08-22 21:16:45 +02:00
commit 05c31315d4
4 changed files with 61 additions and 84 deletions

View File

@ -76,9 +76,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
# the nearest multiple of 16 kilobytes. # the nearest multiple of 16 kilobytes.
CCACHE_CACHE_SIZE="30G" CCACHE_CACHE_SIZE="30G"
# forcing install of all packages (yes/no)
FORCE_INSTALL="no"
# install devtools on development builds # install devtools on development builds
if [ "$OPENELEC_VERSION" = "devel" ]; then if [ "$OPENELEC_VERSION" = "devel" ]; then
DEVTOOLS=yes DEVTOOLS=yes

View File

@ -87,14 +87,7 @@ fi
ln -s lib $INSTALL/usr/lib64 ln -s lib $INSTALL/usr/lib64
fi fi
echo "$DISTRONAME" > $INSTALL/etc/distribution
echo "$PROJECT.$TARGET_ARCH" > $INSTALL/etc/arch
echo "$OPENELEC_VERSION" > $INSTALL/etc/version
echo "$TARGET_VERSION" > $INSTALL/etc/release echo "$TARGET_VERSION" > $INSTALL/etc/release
echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial")) - Version: $OPENELEC_VERSION" > $INSTALL/etc/openelec-release
if [ -n "$GIT_HASH" ]; then
echo "$GIT_HASH" >> $INSTALL/etc/gitrev
fi
# create /etc/os-release # create /etc/os-release
echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
@ -114,12 +107,6 @@ fi
echo -e "OPENELEC_BUILD=\"unofficial\"" >> $INSTALL/etc/os-release echo -e "OPENELEC_BUILD=\"unofficial\"" >> $INSTALL/etc/os-release
fi fi
if [ "$OFFICIAL" = "yes" ]; then
echo "official" > $INSTALL/etc/build
else
echo "unofficial" > $INSTALL/etc/build
fi
# create /etc/issue # create /etc/issue
echo $GREETING0 > $INSTALL/etc/issue echo $GREETING0 > $INSTALL/etc/issue
echo $GREETING1 >> $INSTALL/etc/issue echo $GREETING1 >> $INSTALL/etc/issue

View File

@ -41,11 +41,7 @@ fi
STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
if [ -f $STAMP -a $PKG_DIR/install -nt $STAMP ]; then [ -f $STAMP ] && exit 0
rm -f $STAMP
fi
[ -f $STAMP -a $FORCE_INSTALL = "no" ] && exit 0
if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then
echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0 echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0
@ -130,7 +126,6 @@ if [ "$TARGET" = target ] ; then
mkdir -p $INSTALL/lib/modprobe.d mkdir -p $INSTALL/lib/modprobe.d
cp $PKG_DIR/modprobe.d/*.conf $INSTALL/lib/modprobe.d cp $PKG_DIR/modprobe.d/*.conf $INSTALL/lib/modprobe.d
fi fi
fi fi
# unset functions # unset functions
@ -161,7 +156,4 @@ fi
fi fi
fi fi
for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do touch $STAMP
eval val=\$$i
echo "STAMP_$i=\"$val"\" >> $STAMP
done

View File

@ -93,6 +93,7 @@ export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
[ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION} cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
fi fi
if [ "$(type -t post_unpack)" = "function" ]; then if [ "$(type -t post_unpack)" = "function" ]; then
post_unpack post_unpack
fi fi