From 56eac46d6c188424e5f438b878f2965283725150 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 12 Jul 2017 16:51:45 +0300 Subject: [PATCH] Remove useless SOURCES variable --- lib/chroot-buildpackages.sh | 2 +- lib/common.sh | 16 ++++++++-------- lib/general.sh | 10 +++++----- lib/main.sh | 2 -- packages/extras/firmware.sh | 12 ++++++------ packages/extras/mt7601.sh | 4 ++-- packages/extras/rtl8192cu.sh | 4 ++-- packages/extras/usb-redirector.sh | 22 +++++++++++----------- 8 files changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh index ed97eddc1..52d7aef22 100644 --- a/lib/chroot-buildpackages.sh +++ b/lib/chroot-buildpackages.sh @@ -228,7 +228,7 @@ chroot_build_packages() fetch_from_repo "$package_repo" "extra/$package_name" "$package_ref" eval systemd-nspawn -a -q -D $target_dir --tmpfs=/root/build --tmpfs=/tmp:mode=777 --bind-ro $SRC/packages/extras-buildpkgs/:/root/overlay \ - --bind-ro $SRC/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" 2>&1 \ + --bind-ro $SRC/cache/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" 2>&1 \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/buildpkg.log'} [[ ${PIPESTATUS[0]} -eq 2 ]] && failed+=("$package_name:$release:$arch") mv $target_dir/root/*.deb $plugin_target_dir 2>/dev/null diff --git a/lib/common.sh b/lib/common.sh index 0dd0b79fb..49e51c24a 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -27,13 +27,13 @@ compile_uboot() # not optimal, but extra cleaning before overlayfs_wrapper should keep sources directory clean if [[ $CLEAN_LEVEL == *make* ]]; then display_alert "Cleaning" "$BOOTSOURCEDIR" "info" - (cd $SOURCES/$BOOTSOURCEDIR; make clean > /dev/null 2>&1) + (cd $SRC/cache/sources/$BOOTSOURCEDIR; make clean > /dev/null 2>&1) fi if [[ $USE_OVERLAYFS == yes ]]; then - local ubootdir=$(overlayfs_wrapper "wrap" "$SOURCES/$BOOTSOURCEDIR" "u-boot_${LINUXFAMILY}_${BRANCH}") + local ubootdir=$(overlayfs_wrapper "wrap" "$SRC/cache/sources/$BOOTSOURCEDIR" "u-boot_${LINUXFAMILY}_${BRANCH}") else - local ubootdir="$SOURCES/$BOOTSOURCEDIR" + local ubootdir="$SRC/cache/sources/$BOOTSOURCEDIR" fi cd "$ubootdir" @@ -66,7 +66,7 @@ compile_uboot() if [[ $CLEAN_LEVEL == *make* ]]; then display_alert "Cleaning" "$BOOTSOURCEDIR" "info" - (cd $SOURCES/$BOOTSOURCEDIR; make clean > /dev/null 2>&1) + (cd $SRC/cache/sources/$BOOTSOURCEDIR; make clean > /dev/null 2>&1) fi [[ $FORCE_CHECKOUT == yes ]] && advanced_patch "u-boot" "$BOOTPATCHDIR" "$BOARD" "$target_patchdir" "$BRANCH" "${LINUXFAMILY}-${BOARD}-${BRANCH}" @@ -166,13 +166,13 @@ compile_kernel() { if [[ $CLEAN_LEVEL == *make* ]]; then display_alert "Cleaning" "$LINUXSOURCEDIR" "info" - (cd $SOURCES/$LINUXSOURCEDIR; make ARCH=$ARCHITECTURE clean >/dev/null 2>&1) + (cd $SRC/cache/sources/$LINUXSOURCEDIR; make ARCH=$ARCHITECTURE clean >/dev/null 2>&1) fi if [[ $USE_OVERLAYFS == yes ]]; then - local kerneldir=$(overlayfs_wrapper "wrap" "$SOURCES/$LINUXSOURCEDIR" "kernel_${LINUXFAMILY}_${BRANCH}") + local kerneldir=$(overlayfs_wrapper "wrap" "$SRC/cache/sources/$LINUXSOURCEDIR" "kernel_${LINUXFAMILY}_${BRANCH}") else - local kerneldir="$SOURCES/$LINUXSOURCEDIR" + local kerneldir="$SRC/cache/sources/$LINUXSOURCEDIR" fi cd "$kerneldir" @@ -276,7 +276,7 @@ compile_sunxi_tools() { fetch_from_repo "https://github.com/linux-sunxi/sunxi-tools.git" "sunxi-tools" "branch:master" # Compile and install only if git commit hash changed - cd $SOURCES/sunxi-tools + cd $SRC/cache/sources/sunxi-tools if [[ ! -f .commit_id || $(git rev-parse @ 2>/dev/null) != $(<.commit_id) ]]; then display_alert "Compiling" "sunxi-tools" "info" make -s clean >/dev/null diff --git a/lib/general.sh b/lib/general.sh index ad675651f..a2d2bfc78 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -67,7 +67,7 @@ cleaning() ;; sources) # delete output/sources and output/buildpkg - [[ -d $SOURCES ]] && display_alert "Cleaning" "sources" "info" && rm -rf $SOURCES/* $DEST/buildpkg/* + [[ -d $SRC/cache/sources ]] && display_alert "Cleaning" "sources" "info" && rm -rf $SRC/cache/sources/* $DEST/buildpkg/* ;; oldcache) @@ -200,8 +200,8 @@ fetch_from_repo() else local workdir=$dir fi - mkdir -p $SOURCES/$workdir - cd $SOURCES/$workdir + mkdir -p $SRC/cache/sources/$workdir + cd $SRC/cache/sources/$workdir # check if existing remote URL for the repo or branch does not match current one # may not be supported by older git versions @@ -270,7 +270,7 @@ fetch_from_repo() display_alert "Updating submodules" "" "ext" # FML: http://stackoverflow.com/a/17692710 for i in $(git config -f .gitmodules --get-regexp path | awk '{ print $2 }'); do - cd $SOURCES/$workdir + cd $SRC/cache/sources/$workdir local surl=$(git config -f .gitmodules --get "submodule.$i.url") local sref=$(git config -f .gitmodules --get "submodule.$i.branch") if [[ -n $sref ]]; then @@ -539,7 +539,7 @@ prepare_host() fi # create directory structure - mkdir -p $SOURCES $DEST/debs/extra $DEST/debug $CACHEDIR/rootfs $SRC/userpatches/{overlay,CREATE_PATCHES} $SRC/cache/toolchains + mkdir -p $DEST/debs/extra $DEST/debug $SRC/userpatches/{overlay,CREATE_PATCHES} $SRC/cache/{sources,toolchains,rootfs} find $SRC/patch -type d ! -name . | sed "s%/patch%/userpatches%" | xargs mkdir -p # download external Linaro compiler and missing special dependencies since they are needed for certain sources diff --git a/lib/main.sh b/lib/main.sh index 3a6e3764d..1cebe040c 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -14,8 +14,6 @@ # destination DEST=$SRC/output -# sources for compilation -SOURCES=$SRC/cache/sources TTY_X=$(($(stty size | awk '{print $2}')-6)) # determine terminal width TTY_Y=$(($(stty size | awk '{print $1}')-6)) # determine terminal height diff --git a/packages/extras/firmware.sh b/packages/extras/firmware.sh index cf541f549..4c6bc1a10 100644 --- a/packages/extras/firmware.sh +++ b/packages/extras/firmware.sh @@ -13,18 +13,18 @@ build_firmware() local plugin_repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" local plugin_dir="armbian-firmware${FULL}" - [[ -d "$SOURCES/$plugin_dir" && -n "$SOURCES$plugin_dir" ]] && rm -rf $SOURCES/$plugin_dir + [[ -d $SRC/cache/sources/$plugin_dir ]] && rm -rf $SRC/cache/sources/$plugin_dir if [[ -n $FULL ]]; then fetch_from_repo "$plugin_repo" "$plugin_dir/lib/firmware" "branch:master" fi - mkdir -p $SOURCES/$plugin_dir/lib/firmware + mkdir -p $SRC/cache/sources/$plugin_dir/lib/firmware # overlay our firmware - cp -R $SRC/packages/extras/firmware/* $SOURCES/$plugin_dir/lib/firmware + cp -R $SRC/packages/extras/firmware/* $SRC/cache/sources/$plugin_dir/lib/firmware # cleanup what's not needed for sure - rm -rf $SOURCES/$plugin_dir/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia,matrox,.git} - cd $SOURCES/$plugin_dir + rm -rf $SRC/cache/sources/$plugin_dir/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia,matrox,.git} + cd $SRC/cache/sources/$plugin_dir # set up control file mkdir -p DEBIAN @@ -40,7 +40,7 @@ build_firmware() Description: Linux firmware${FULL} END - cd $SOURCES + cd $SRC/cache/sources # pack mv armbian-firmware${FULL} armbian-firmware${FULL}_${REVISION}_${ARCH} dpkg -b armbian-firmware${FULL}_${REVISION}_${ARCH} >> $DEST/debug/install.log 2>&1 diff --git a/packages/extras/mt7601.sh b/packages/extras/mt7601.sh index 5a672781e..50f8885b8 100644 --- a/packages/extras/mt7601.sh +++ b/packages/extras/mt7601.sh @@ -14,7 +14,7 @@ install_mt7601() fetch_from_repo "$plugin_repo" "$plugin_dir" "branch:old" - cd $SOURCES/$plugin_dir + cd $SRC/cache/sources/$plugin_dir # DKMS support patch rm src/dkms.conf @@ -64,7 +64,7 @@ install_mt7601() cd src make -s ARCH=$ARCHITECTURE CROSS_COMPILE="$CCACHE $KERNEL_COMPILER" clean >> $DEST/debug/compilation.log 2>&1 - make -s -j4 ARCH=$ARCHITECTURE CROSS_COMPILE="$CCACHE $KERNEL_COMPILER" LINUX_SRC=$SOURCES/$LINUXSOURCEDIR/ >> $DEST/debug/compilation.log 2>&1 + make -s -j4 ARCH=$ARCHITECTURE CROSS_COMPILE="$CCACHE $KERNEL_COMPILER" LINUX_SRC=$SRC/cache/sources/$LINUXSOURCEDIR/ >> $DEST/debug/compilation.log 2>&1 cp os/linux/*.ko $CACHEDIR/$SDCARD/lib/modules/$VER-$LINUXFAMILY/kernel/net/wireless/ mkdir -p $CACHEDIR/$SDCARD/etc/Wireless/RT2870STA cp RT2870STA.dat $CACHEDIR/$SDCARD/etc/Wireless/RT2870STA/ diff --git a/packages/extras/rtl8192cu.sh b/packages/extras/rtl8192cu.sh index 689d1d9ef..82587fcb8 100644 --- a/packages/extras/rtl8192cu.sh +++ b/packages/extras/rtl8192cu.sh @@ -16,7 +16,7 @@ install_rtl8192cu() local plugin_dir="rt8192cu" fetch_from_repo "$plugin_repo" "$plugin_dir" "branch:master" - cd $SOURCES/$plugin_dir + cd $SRC/cache/sources/$plugin_dir make ARCH=$ARCHITECTURE CROSS_COMPILE=$KERNEL_COMPILER clean >> $DEST/debug/compilation.log @@ -51,7 +51,7 @@ install_rtl8192cu() EOF # GCC5 compatibility patch end - make ARCH=$ARCHITECTURE CROSS_COMPILE=$KERNEL_COMPILER KSRC=$SOURCES/$LINUXSOURCEDIR/ >> $DEST/debug/compilation.log + make ARCH=$ARCHITECTURE CROSS_COMPILE=$KERNEL_COMPILER KSRC=$SRC/cache/sources/$LINUXSOURCEDIR/ >> $DEST/debug/compilation.log cp *.ko $CACHEDIR/$SDCARD/lib/modules/$VER-$LINUXFAMILY/kernel/net/wireless/ depmod -b $CACHEDIR/$SDCARD/ $VER-$LINUXFAMILY #cp blacklist*.conf $CACHEDIR/$SDCARD/etc/modprobe.d/ diff --git a/packages/extras/usb-redirector.sh b/packages/extras/usb-redirector.sh index faae7900a..a077db5fb 100644 --- a/packages/extras/usb-redirector.sh +++ b/packages/extras/usb-redirector.sh @@ -13,7 +13,7 @@ install_usb_redirector() { IFS='.' read -a array <<< "$VER" # Current USB redirector is broken for old kernels - cd $SOURCES + cd $SRC/cache/sources if (( "${array[0]}" == "4" )) && (( "${array[1]}" >= "1" )); then wget -q http://www.incentivespro.com/usb-redirector-linux-arm-eabi.tar.gz if (( "${array[1]}" >= "4" )); then @@ -27,21 +27,21 @@ install_usb_redirector() tar xfz usb-redirector-linux-arm-eabi.tar.gz rm usb-redirector-linux-arm-eabi.tar.gz - cd $SOURCES/usb-redirector-linux-arm-eabi/files/modules/src/tusbd + cd $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/modules/src/tusbd # patch to work with newer kernels sed -e "s/f_dentry/f_path.dentry/g" -i usbdcdev.c if [[ $ARCH == *64* ]]; then ARCHITECTURE=arm64; else ARCHITECTURE=arm; fi - make -j1 ARCH=$ARCHITECTURE CROSS_COMPILE="$CCACHE $KERNEL_COMPILER" KERNELDIR=$SOURCES/$LINUXSOURCEDIR/ $EXTRA_BUILD_FLAGS >> $DEST/debug/install.log 2>&1 + make -j1 ARCH=$ARCHITECTURE CROSS_COMPILE="$CCACHE $KERNEL_COMPILER" KERNELDIR=$SRC/cache/sources/$LINUXSOURCEDIR/ $EXTRA_BUILD_FLAGS >> $DEST/debug/install.log 2>&1 # configure USB redirector - sed -e 's/%INSTALLDIR_TAG%/\/usr\/local/g' $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd > $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 - sed -e 's/%PIDFILE_TAG%/\/var\/run\/usbsrvd.pid/g' $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 > $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd - sed -e 's/%STUBNAME_TAG%/tusbd/g' $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd > $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 - sed -e 's/%DAEMONNAME_TAG%/usbsrvd/g' $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 > $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd - chmod +x $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd + sed -e 's/%INSTALLDIR_TAG%/\/usr\/local/g' $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd > $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 + sed -e 's/%PIDFILE_TAG%/\/var\/run\/usbsrvd.pid/g' $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 > $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd + sed -e 's/%STUBNAME_TAG%/tusbd/g' $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd > $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 + sed -e 's/%DAEMONNAME_TAG%/usbsrvd/g' $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd1 > $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd + chmod +x $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd # copy to root - cp $SOURCES/usb-redirector-linux-arm-eabi/files/usb* $CACHEDIR/$SDCARD/usr/local/bin/ - cp $SOURCES/usb-redirector-linux-arm-eabi/files/modules/src/tusbd/tusbd.ko $CACHEDIR/$SDCARD/usr/local/bin/ - cp $SOURCES/usb-redirector-linux-arm-eabi/files/rc.usbsrvd $CACHEDIR/$SDCARD/etc/init.d/ + cp $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/usb* $CACHEDIR/$SDCARD/usr/local/bin/ + cp $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/modules/src/tusbd/tusbd.ko $CACHEDIR/$SDCARD/usr/local/bin/ + cp $SRC/cache/sources/usb-redirector-linux-arm-eabi/files/rc.usbsrvd $CACHEDIR/$SDCARD/etc/init.d/ # not started by default ----- update.rc rc.usbsrvd defaults # chroot $CACHEDIR/$SDCARD /bin/bash -c "update-rc.d rc.usbsrvd defaults }