BUILD: add $ROOT, convert to absolute path

This commit is contained in:
MilhouseVH 2017-02-17 06:40:16 +00:00
parent e390cf1008
commit 02089e2ca5
6 changed files with 22 additions and 22 deletions

View File

@ -120,7 +120,7 @@ get_module_dir() {
get_build_dir() {
local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
echo $BUILD/${_PKG_NAME}-${_PKG_VERSION}
fi
}

View File

@ -20,14 +20,14 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
if [ -n "$DEVICE" ]; then
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
if [ "$LIBREELEC_VERSION" = "devel" ] ; then
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
fi
else
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
if [ "$LIBREELEC_VERSION" = "devel" ] ; then
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
fi
fi
@ -47,7 +47,7 @@ SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
LIB_PREFIX=$SYSROOT_PREFIX/usr
TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
FAKEROOT_SCRIPT=$ROOT/.fakeroot.$BUILD
FAKEROOT_SCRIPT=$ROOT/.fakeroot.$(basename $BUILD)
if [ -z "$INSTALL" ]; then
INSTALL=$BUILD/image/system
@ -187,7 +187,7 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
. config/optimize
if [ -z "$CCACHE_DIR" ]; then
export CCACHE_DIR=$ROOT/$BUILD/.ccache
export CCACHE_DIR=$BUILD/.ccache
fi
export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config

View File

@ -45,10 +45,10 @@ pre_make_target() {
pre_configure_target() {
# use it here to be sure libhdhomerun is already built
PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)"
PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)"
# absolute path
LIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)
LIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)
sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" ../userhdhomerun/CMakeLists.txt
sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_tuner.cpp
sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_controller.cpp

View File

@ -101,7 +101,7 @@ post_patch() {
cp $KERNEL_CFG_FILE $PKG_BUILD/.config
if [ ! "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config
sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config
fi
# set default hostname based on $DISTRONAME
@ -170,7 +170,7 @@ make_target() {
rm -f $INSTALL/usr/lib/modules/*/source
( cd $ROOT
rm -rf $ROOT/$BUILD/initramfs
rm -rf $BUILD/initramfs
$SCRIPTS/install initramfs
)
@ -183,7 +183,7 @@ make_target() {
LDFLAGS="" make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $ROOT/$BUILD/image/initramfs.cpio \
LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $BUILD/image/initramfs.cpio \
$ANDROID_BOOTIMG_OPTIONS --output arch/$TARGET_KERNEL_ARCH/boot/boot.img
mv -f arch/$TARGET_KERNEL_ARCH/boot/boot.img arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET
fi

View File

@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_forkpty=no \
pre_configure_target() {
# patch lirc-make-devinput to use target kernel include
sed -e "s|/usr/include/linux/|${SYSROOT_PREFIX}/usr/include/linux/|g" \
-i ${ROOT}/${PKG_BUILD}/tools/lirc-make-devinput
-i $PKG_BUILD/tools/lirc-make-devinput
}
post_makeinstall_target() {

View File

@ -41,19 +41,19 @@ if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then
fi
post_install() {
( cd $ROOT/$BUILD/initramfs
( cd $BUILD/initramfs
if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then
ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib64
mkdir -p $ROOT/$BUILD/initramfs/usr
ln -sf /usr/lib $ROOT/$BUILD/initramfs/usr/lib64
ln -sf /usr/lib $BUILD/initramfs/lib64
mkdir -p $BUILD/initramfs/usr
ln -sf /usr/lib $BUILD/initramfs/usr/lib64
fi
ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib
ln -sf /usr/bin $ROOT/$BUILD/initramfs/bin
ln -sf /usr/sbin $ROOT/$BUILD/initramfs/sbin
ln -sf /usr/lib $BUILD/initramfs/lib
ln -sf /usr/bin $BUILD/initramfs/bin
ln -sf /usr/sbin $BUILD/initramfs/sbin
mkdir -p $ROOT/$BUILD/image/
mkdir -p $BUILD/image/
fakeroot -- sh -c \
"mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio"
"mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $BUILD/image/initramfs.cpio"
)
}