From 9b12d2907fe297162427d35b5b04b85ef4039d0b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Wed, 21 Oct 2020 15:31:32 +0200 Subject: [PATCH] Improve multicore build process by make use of overlays and uniqie temporally build directories --- lib/compilation-prepare.sh | 210 ++++++++++++++++++------------------- lib/compilation.sh | 70 +++++++------ lib/desktop.sh | 7 +- lib/general.sh | 2 +- lib/makeboarddeb.sh | 5 +- 5 files changed, 150 insertions(+), 144 deletions(-) diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index e30ecd277f75..7f592bee85c5 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -22,12 +22,12 @@ compilation_prepare() if linux-version compare "${version}" ge 5.6; then display_alert "Adjusting" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-5.6.y.patch" "applying" else if linux-version compare "${version}" ge 5.3; then display_alert "Adjusting" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-5.3.y.patch" "applying" fi fi @@ -35,39 +35,39 @@ compilation_prepare() if [[ "${version}" == "4.19."* ]] && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == meson64 || \ "$LINUXFAMILY" == mvebu64 || "$LINUXFAMILY" == mt7623 || "$LINUXFAMILY" == mvebu ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.19.y.patch" "applying" fi if [[ "${version}" == "4.14."* ]] && [[ "$LINUXFAMILY" == s5p6818 || "$LINUXFAMILY" == mvebu64 || \ "$LINUXFAMILY" == imx7d || "$LINUXFAMILY" == odroidxu4 || "$LINUXFAMILY" == mvebu ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.14.y.patch" "applying" fi if [[ "${version}" == "4.4."* || "${version}" == "4.9."* ]] && \ [[ "$LINUXFAMILY" == rockpis || "$LINUXFAMILY" == rk3399 ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y-rk3399.patch" "applying" fi if [[ "${version}" == "4.4."* ]] && [[ "$LINUXFAMILY" == rockchip64 ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y-rockchip64.patch" "applying" fi if [[ "${version}" == "4.4."* ]] && [[ "$LINUXFAMILY" == rockchip || "$LINUXFAMILY" == rk322x ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y.patch" "applying" fi if [[ "${version}" == "4.9."* ]] && [[ "$LINUXFAMILY" == meson64 || "$LINUXFAMILY" == odroidc4 ]]; then display_alert "Adjustin" "packaging" "info" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/patch/misc/general-packaging-4.9.y.patch" "applying" fi @@ -142,7 +142,7 @@ compilation_prepare() display_alert "Adding" "AUFS ${aufstag}" "info" local aufsver="branch:aufs${aufstag}" fetch_from_repo "https://github.com/sfjro/aufs5-standalone" "aufs5" "branch:${aufsver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit + cd "$kerneldir" || exit process_patch_file "${SRC}/cache/sources/aufs5/${aufsver#*:}/aufs5-kbuild.patch" "applying" process_patch_file "${SRC}/cache/sources/aufs5/${aufsver#*:}/aufs5-base.patch" "applying" process_patch_file "${SRC}/cache/sources/aufs5/${aufsver#*:}/aufs5-mmap.patch" "applying" @@ -165,23 +165,23 @@ compilation_prepare() display_alert "Adding" "WireGuard VPN for Linux 3.10 - 5.5 ${wirever} " "info" fetch_from_repo "https://git.zx2c4.com/wireguard-linux-compat" "wireguard" "${wirever}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/wireguard" - cp -R "${SRC}/cache/sources/wireguard/${wirever#*:}/src/" "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/wireguard" + cd "$kerneldir" || exit + rm -rf "$kerneldir/net/wireguard" + cp -R "${SRC}/cache/sources/wireguard/${wirever#*:}/src/" "$kerneldir/net/wireguard" sed -i "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Makefile" + "$kerneldir/net/Makefile" sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Kconfig" + "$kerneldir/net/Kconfig" # remove duplicates - [[ $(grep -c wireguard "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Makefile") -gt 1 ]] && \ - sed -i '0,/wireguard/{/wireguard/d;}' "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Makefile" - [[ $(grep -c wireguard "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Kconfig") -gt 1 ]] && \ - sed -i '0,/wireguard/{/wireguard/d;}' "${SRC}/cache/sources/${LINUXSOURCEDIR}/net/Kconfig" + [[ $(grep -c wireguard "$kerneldir/net/Makefile") -gt 1 ]] && \ + sed -i '0,/wireguard/{/wireguard/d;}' "$kerneldir/net/Makefile" + [[ $(grep -c wireguard "$kerneldir/net/Kconfig") -gt 1 ]] && \ + sed -i '0,/wireguard/{/wireguard/d;}' "$kerneldir/net/Kconfig" # headers workaround display_alert "Patching WireGuard" "Applying workaround for headers compilation" "info" sed -i '/mkdir -p "$destdir"/a mkdir -p "$destdir"/net/wireguard; \ touch "$destdir"/net/wireguard/{Kconfig,Makefile} # workaround for Wireguard' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/scripts/package/builddeb" + "$kerneldir/scripts/package/builddeb" fi @@ -196,7 +196,7 @@ compilation_prepare() display_alert "Adding" "Drivers for 2.5Gb RTL8152/RTL8153 USB dongles ${rtl8152ver}" "info" fetch_from_repo "https://github.com/igorpecovnik/realtek-r8152-linux" "rtl8152" "${rtl8152ver}" "yes" cp -R "${SRC}/cache/sources/rtl8152/${rtl8152ver#*:}"/{r8152.c,compatibility.h} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/usb/" + "$kerneldir/drivers/net/usb/" fi @@ -210,25 +210,25 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8189ES chipsets ${rtl8189esver}" "info" fetch_from_repo "https://github.com/jwrdegoede/rtl8189ES_linux" "rtl8189es" "${rtl8189esver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189es" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189es/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8189es" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8189es/" cp -R "${SRC}/cache/sources/rtl8189es/${rtl8189esver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189es" + "$kerneldir/drivers/net/wireless/rtl8189es" # Makefile cp "${SRC}/cache/sources/rtl8189es/${rtl8189esver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189es/Makefile" + "$kerneldir/drivers/net/wireless/rtl8189es/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8189es/${rtl8189esver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8189es/${rtl8189esver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189es/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8189es/Kconfig" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8189ES) += rtl8189es/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8189ES) += rtl8189es/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8189es\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -245,25 +245,25 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8189FS chipsets ${rtl8189fsver}" "info" fetch_from_repo "https://github.com/jwrdegoede/rtl8189ES_linux" "rtl8189fs" "${rtl8189fsver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189fs" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189fs/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8189fs" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8189fs/" cp -R "${SRC}/cache/sources/rtl8189fs/${rtl8189fsver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189fs" + "$kerneldir/drivers/net/wireless/rtl8189fs" # Makefile cp "${SRC}/cache/sources/rtl8189fs/${rtl8189fsver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189fs/Makefile" + "$kerneldir/drivers/net/wireless/rtl8189fs/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8189fs/${rtl8189fsver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8189fs/${rtl8189fsver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8189fs/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8189fs/Kconfig" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8189FS) += rtl8189fs/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8189FS) += rtl8189fs/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8189fs\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -280,25 +280,25 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info" fetch_from_repo "https://github.com/Mange/rtl8192eu-linux-driver" "rtl8192eu" "${rtl8192euver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8192eu" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8192eu/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8192eu" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8192eu/" cp -R "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8192eu" + "$kerneldir/drivers/net/wireless/rtl8192eu" # Makefile cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8192eu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8192eu/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8192eu/${rtl8192euver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8192eu/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8192eu/Kconfig" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8192EU) += rtl8192eu/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8192EU) += rtl8192eu/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8192eu\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -315,24 +315,24 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8811, 8812, 8814 and 8821 chipsets ${rtl8812auver}" "info" fetch_from_repo "https://github.com/aircrack-ng/rtl8812au" "rtl8812au" "${rtl8812auver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8812au" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8812au/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8812au" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8812au/" cp -R "${SRC}/cache/sources/rtl8812au/${rtl8812auver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8812au" + "$kerneldir/drivers/net/wireless/rtl8812au" # Makefile cp "${SRC}/cache/sources/rtl8812au/${rtl8812auver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8812au/Makefile" + "$kerneldir/drivers/net/wireless/rtl8812au/Makefile" # Kconfig cp "${SRC}/cache/sources/rtl8812au/${rtl8812auver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8812au/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8812au/Kconfig" # Add to section Makefile - echo "obj-\$(CONFIG_88XXAU) += rtl8812au/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_88XXAU) += rtl8812au/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8812au\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -345,26 +345,26 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info" fetch_from_repo "https://github.com/karabek/xradio" "xradio" "branch:master" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/xradio" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/xradio/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/xradio" + mkdir -p "$kerneldir/drivers/net/wireless/xradio/" cp "${SRC}"/cache/sources/xradio/master/*.{h,c} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/xradio/" + "$kerneldir/drivers/net/wireless/xradio/" # Makefile cp "${SRC}/cache/sources/xradio/master/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/xradio/Makefile" + "$kerneldir/drivers/net/wireless/xradio/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/xradio/master/Kconfig" cp "${SRC}/cache/sources/xradio/master/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/xradio/Kconfig" + "$kerneldir/drivers/net/wireless/xradio/Kconfig" # Add to section Makefile echo "obj-\$(CONFIG_WLAN_VENDOR_XRADIO) += xradio/" \ - >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/xradio\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -381,33 +381,33 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets ${rtl8811cuver}" "info" fetch_from_repo "https://github.com/brektrou/rtl8821CU" "rtl8811cu" "${rtl8811cuver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8811cu" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8811cu/" cp -R "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}"/{core,hal,include,os_dep,platform,rtl8821c.mk} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu" + "$kerneldir/drivers/net/wireless/rtl8811cu" # Makefile cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8811cu/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8811cu/Kconfig" # Disable debug sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8811cu/Makefile" # Address ARM related bug https://github.com/aircrack-ng/rtl8812au/issues/233 sed -i "s/^CONFIG_MP_VHT_HW_TX_MODE.*/CONFIG_MP_VHT_HW_TX_MODE = n/" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8811cu/Makefile" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8821CU) += rtl8811cu/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8821CU) += rtl8811cu/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8811cu\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -424,29 +424,29 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets ${rtl8188euver}" "info" fetch_from_repo "https://github.com/aircrack-ng/rtl8188eus" "rtl8188eu" "${rtl8188euver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8188eu" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8188eu/" cp -R "${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu" + "$kerneldir/drivers/net/wireless/rtl8188eu" # Makefile cp "${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8188eu/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8188eu/Kconfig" # Disable debug sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Makefile" + "$kerneldir/drivers/net/wireless/rtl8188eu/Makefile" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8188EU) += rtl8188eu/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8188EU) += rtl8188eu/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8188eu\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" # kernel 5.6 -> process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu.patch" "applying" @@ -466,29 +466,29 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 88x2bu chipsets ${rtl88x2buver}" "info" fetch_from_repo "https://github.com/cilynx/rtl88x2bu" "rtl88x2bu" "${rtl88x2buver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl88x2bu" + mkdir -p "$kerneldir/drivers/net/wireless/rtl88x2bu/" cp -R "${SRC}/cache/sources/rtl88x2bu/${rtl88x2buver#*:}"/{core,hal,include,os_dep,platform,halmac.mk,rtl8822b.mk} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu" + "$kerneldir/drivers/net/wireless/rtl88x2bu" # Makefile cp "${SRC}/cache/sources/rtl88x2bu/${rtl88x2buver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/Makefile" + "$kerneldir/drivers/net/wireless/rtl88x2bu/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl88x2bu/${rtl88x2buver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl88x2bu/${rtl88x2buver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/Kconfig" + "$kerneldir/drivers/net/wireless/rtl88x2bu/Kconfig" # Adjust path sed -i 's/include $(src)\/rtl8822b.mk /include $(TopDIR)\/drivers\/net\/wireless\/rtl88x2bu\/rtl8822b.mk/' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/Makefile" + "$kerneldir/drivers/net/wireless/rtl88x2bu/Makefile" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8822BU) += rtl88x2bu/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8822BU) += rtl88x2bu/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl88x2bu\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -505,29 +505,29 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info" fetch_from_repo "https://github.com/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" - cd "${SRC}/cache/sources/${LINUXSOURCEDIR}" || exit - rm -rf "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds" - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/" + cd "$kerneldir" || exit + rm -rf "$kerneldir/drivers/net/wireless/rtl8723ds" + mkdir -p "$kerneldir/drivers/net/wireless/rtl8723ds/" cp -R "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}"/{core,hal,include,os_dep,platform} \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds" + "$kerneldir/drivers/net/wireless/rtl8723ds" # Makefile cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Makefile" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/Makefile" + "$kerneldir/drivers/net/wireless/rtl8723ds/Makefile" # Kconfig sed -i 's/---help---/help/g' "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig" cp "${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/Kconfig" + "$kerneldir/drivers/net/wireless/rtl8723ds/Kconfig" # Disable debug sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/Makefile" + "$kerneldir/drivers/net/wireless/rtl8723ds/Makefile" # Add to section Makefile - echo "obj-\$(CONFIG_RTL8723DS) += rtl8723ds/" >> "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile" + echo "obj-\$(CONFIG_RTL8723DS) += rtl8723ds/" >> "$kerneldir/drivers/net/wireless/Makefile" sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \ - "${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig" + "$kerneldir/drivers/net/wireless/Kconfig" fi @@ -544,24 +544,24 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8723DU chipsets ${rtl8723duver}" "info" fetch_from_repo "https://github.com/lwfinger/rtl8723du" "rtl8723du" "${rtl8723duver}" "yes" - cd ${SRC}/cache/sources/${LINUXSOURCEDIR} - rm -rf ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723du - mkdir -p ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723du/ + cd $kerneldir + rm -rf $kerneldir/drivers/net/wireless/rtl8723du + mkdir -p $kerneldir/drivers/net/wireless/rtl8723du/ cp -R ${SRC}/cache/sources/rtl8723du/${rtl8723duver#*:}/{core,hal,include,os_dep,platform} \ - ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723du + $kerneldir/drivers/net/wireless/rtl8723du # Makefile cp ${SRC}/cache/sources/rtl8723du/${rtl8723duver#*:}/Makefile \ - ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723du/Makefile + $kerneldir/drivers/net/wireless/rtl8723du/Makefile # Disable debug sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \ - ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723du/Makefile + $kerneldir/drivers/net/wireless/rtl8723du/Makefile # Add to section Makefile - echo "obj-\$(CONFIG_RTL8723DU) += rtl8723du/" >> $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile + echo "obj-\$(CONFIG_RTL8723DU) += rtl8723du/" >> $kerneldir/drivers/net/wireless/Makefile sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723du\/Kconfig"' \ - $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig + $kerneldir/drivers/net/wireless/Kconfig process_patch_file "${SRC}/patch/misc/wireless-rtl8723du.patch" "applying" fi diff --git a/lib/compilation.sh b/lib/compilation.sh index ccc2a2c99bab..fcef9e202987 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -79,8 +79,7 @@ compile_atf() [[ $(type -t atf_custom_postprocess) == function ]] && atf_custom_postprocess - local atftempdir=$SRC/.tmp/atf-${LINUXFAMILY}-${BOARD}-${BRANCH} - mkdir -p "${atftempdir}" + atftempdir=$(mktemp -d) # copy files to temp directory for f in $target_files; do @@ -144,9 +143,10 @@ compile_uboot() [[ -n $toolchain2 ]] && display_alert "Additional compiler version" "${toolchain2_type}gcc $(eval env PATH="${toolchain}:${toolchain2}:${PATH}" "${toolchain2_type}gcc" -dumpversion)" "info" # create directory structure for the .deb package + uboottempdir=$(mktemp -d) local uboot_name=${CHOSEN_UBOOT}_${REVISION}_${ARCH} - rm -rf $SRC/.tmp/$uboot_name - mkdir -p $SRC/.tmp/$uboot_name/usr/lib/{u-boot,$uboot_name} $SRC/.tmp/$uboot_name/DEBIAN + rm -rf $uboottempdir/$uboot_name + mkdir -p $uboottempdir/$uboot_name/usr/lib/{u-boot,$uboot_name} $uboottempdir/$uboot_name/DEBIAN # process compilation for one or multiple targets while read -r target; do @@ -169,9 +169,9 @@ compile_uboot() # create patch for manual source changes [[ $CREATE_PATCHES == yes ]] && userpatch_create "u-boot" - if [[ -n $ATFSOURCE ]]; then - local atftempdir=$SRC/.tmp/atf-${LINUXFAMILY}-${BOARD}-${BRANCH} + if [[ -n $ATFSOURCE ]]; then cp -Rv "${atftempdir}"/*.bin . + rm -rf "${atftempdir}" fi echo -e "\n\t== u-boot ==\n" >> "${DEST}"/debug/compilation.log @@ -233,12 +233,12 @@ compile_uboot() f_dst=$(basename "${f_src}") fi [[ ! -f $f_src ]] && exit_with_error "U-boot file not found" "$(basename "${f_src}")" - cp "${f_src}" "${SRC}/.tmp/${uboot_name}/usr/lib/${uboot_name}/${f_dst}" + cp "${f_src}" "$uboottempdir/${uboot_name}/usr/lib/${uboot_name}/${f_dst}" done done <<< "$UBOOT_TARGET_MAP" # declare -f on non-defined function does not do anything - cat <<-EOF > "${SRC}/.tmp/${uboot_name}/usr/lib/u-boot/platform_install.sh" + cat <<-EOF > "$uboottempdir/${uboot_name}/usr/lib/u-boot/platform_install.sh" DIR=/usr/lib/$uboot_name $(declare -f write_uboot_platform) $(declare -f write_uboot_platform_mtd) @@ -246,7 +246,7 @@ compile_uboot() EOF # set up control file - cat <<-EOF > "${SRC}/.tmp/${uboot_name}/DEBIAN/control" + cat <<-EOF > "$uboottempdir/${uboot_name}/DEBIAN/control" Package: linux-u-boot-${BOARD}-${BRANCH} Version: $REVISION Architecture: $ARCH @@ -262,24 +262,20 @@ compile_uboot() # copy config file to the package # useful for FEL boot with overlayfs_wrapper - [[ -f .config && -n $BOOTCONFIG ]] && cp .config "${SRC}/.tmp/${uboot_name}/usr/lib/u-boot/${BOOTCONFIG}" + [[ -f .config && -n $BOOTCONFIG ]] && cp .config "$uboottempdir/${uboot_name}/usr/lib/u-boot/${BOOTCONFIG}" # copy license files from typical locations - [[ -f COPYING ]] && cp COPYING "${SRC}/.tmp/${uboot_name}/usr/lib/u-boot/LICENSE" - [[ -f Licenses/README ]] && cp Licenses/README "${SRC}/.tmp/${uboot_name}/usr/lib/u-boot/LICENSE" - [[ -n $atftempdir && -f $atftempdir/license.md ]] && cp "${atftempdir}/license.md" "${SRC}/.tmp/${uboot_name}/usr/lib/u-boot/LICENSE.atf" + [[ -f COPYING ]] && cp COPYING "$uboottempdir/${uboot_name}/usr/lib/u-boot/LICENSE" + [[ -f Licenses/README ]] && cp Licenses/README "$uboottempdir/${uboot_name}/usr/lib/u-boot/LICENSE" + [[ -n $atftempdir && -f $atftempdir/license.md ]] && cp "${atftempdir}/license.md" "$uboottempdir/${uboot_name}/usr/lib/u-boot/LICENSE.atf" display_alert "Building deb" "${uboot_name}.deb" "info" - fakeroot dpkg-deb -b "${SRC}/.tmp/${uboot_name}" "${SRC}/.tmp/${uboot_name}.deb" >> "${DEST}"/debug/output.log 2>&1 - rm -rf "${SRC}/.tmp/${uboot_name}" + fakeroot dpkg-deb -b "$uboottempdir/${uboot_name}" "$uboottempdir/${uboot_name}.deb" >> "${DEST}"/debug/output.log 2>&1 + rm -rf "$uboottempdir/${uboot_name}" [[ -n $atftempdir ]] && rm -rf "${atftempdir}" - [[ ! -f $SRC/.tmp/${uboot_name}.deb ]] && exit_with_error "Building u-boot package failed" + [[ ! -f $uboottempdir/${uboot_name}.deb ]] && exit_with_error "Building u-boot package failed" - mv "${SRC}/.tmp/${uboot_name}.deb" "${DEB_STORAGE}/" - - # store git hash to the file -# echo $hash > ${SRC}/cache/hash/${CHOSEN_UBOOT}.githash -# find "${SRC}/patch/u-boot/${BOOTPATCHDIR}" -maxdepth 1 -printf '%s %P\n' | improved_git hash-object --stdin >> "${SRC}/cache/hash"$([[ ${BETA} == yes ]] && echo "-beta")"/${CHOSEN_UBOOT}.githash" + mv "$uboottempdir/${uboot_name}.deb" "${DEB_STORAGE}/" } compile_kernel() @@ -322,7 +318,7 @@ compile_kernel() version=$(grab_version "$kerneldir") # create linux-source package - with already patched sources - local sources_pkg_dir=$SRC/.tmp/${CHOSEN_KSRC}_${REVISION}_all + local sources_pkg_dir=$(mktemp -d)/${CHOSEN_KSRC}_${REVISION}_all rm -rf "${sources_pkg_dir}" mkdir -p "${sources_pkg_dir}"/usr/src/ "${sources_pkg_dir}/usr/share/doc/linux-source-${version}-${LINUXFAMILY}" "${sources_pkg_dir}"/DEBIAN @@ -358,8 +354,8 @@ compile_kernel() # hack for OdroidXU4. Copy firmare files if [[ $BOARD == odroidxu4 ]]; then - mkdir -p "${SRC}/cache/sources/${LINUXSOURCEDIR}/firmware/edid" - cp "${SRC}"/packages/blobs/odroidxu4/*.bin "${SRC}/cache/sources/${LINUXSOURCEDIR}/firmware/edid" + mkdir -p "${kerneldir}/firmware/edid" + cp "${SRC}"/packages/blobs/odroidxu4/*.bin "${kerneldir}/firmware/edid" fi # hack for deb builder. To pack what's missing in headers pack. @@ -458,7 +454,7 @@ compile_kernel() cd .. || exit # remove firmare image packages here - easier than patching ~40 packaging scripts at once rm -f linux-firmware-image-*.deb - mv ./*.deb "${DEB_STORAGE}/" || exit_with_error "Failed moving kernel DEBs" + cp ./*.deb "${DEB_STORAGE}/" || exit_with_error "Failed moving kernel DEBs" # store git hash to the file echo "${hash}" > "${SRC}/cache/hash"$([[ ${BETA} == yes ]] && echo "-beta")"/linux-image-${BRANCH}-${LINUXFAMILY}.githash" @@ -475,28 +471,31 @@ compile_kernel() compile_firmware() { display_alert "Merging and packaging linux firmware" "@host" "info" + if [[ $USE_MAINLINE_GOOGLE_MIRROR == yes ]]; then plugin_repo="https://kernel.googlesource.com/pub/scm/linux/kernel/git/firmware/linux-firmware.git" else plugin_repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" fi + + firmwaretempdir=$(mktemp -d) + local plugin_dir="armbian-firmware${FULL}" - [[ -d "${SRC}/cache/sources/${plugin_dir}" ]] && rm -rf "${SRC}/cache/sources/${plugin_dir}" - mkdir -p "${SRC}/cache/sources/${plugin_dir}/lib/firmware" + mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware" fetch_from_repo "https://github.com/armbian/firmware" "armbian-firmware-git" "branch:master" if [[ -n $FULL ]]; then fetch_from_repo "$plugin_repo" "linux-firmware-git" "branch:master" # cp : create hardlinks - cp -alf "${SRC}"/cache/sources/linux-firmware-git/* "${SRC}/cache/sources/${plugin_dir}/lib/firmware/" + cp -alf "${SRC}"/cache/sources/linux-firmware-git/* "${firmwaretempdir}/${plugin_dir}/lib/firmware/" fi # overlay our firmware # cp : create hardlinks - cp -alf "${SRC}"/cache/sources/armbian-firmware-git/* "${SRC}/cache/sources/${plugin_dir}/lib/firmware/" + cp -alf "${SRC}"/cache/sources/armbian-firmware-git/* "${firmwaretempdir}/${plugin_dir}/lib/firmware/" # cleanup what's not needed for sure - rm -rf "${SRC}/cache/sources/${plugin_dir}"/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia,matrox,.git} - cd "${SRC}/cache/sources/${plugin_dir}" || exit + rm -rf "${firmwaretempdir}/${plugin_dir}"/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia,matrox,.git} + cd "${firmwaretempdir}/${plugin_dir}" || exit # set up control file mkdir -p DEBIAN @@ -512,12 +511,15 @@ compile_firmware() Description: Linux firmware${FULL} END - cd "${SRC}"/cache/sources || exit + cd "${firmwaretempdir}" || exit # pack mv "armbian-firmware${FULL}" "armbian-firmware${FULL}_${REVISION}_all" fakeroot dpkg -b "armbian-firmware${FULL}_${REVISION}_all" >> "${DEST}"/debug/install.log 2>&1 mv "armbian-firmware${FULL}_${REVISION}_all" "armbian-firmware${FULL}" mv "armbian-firmware${FULL}_${REVISION}_all.deb" "${DEB_STORAGE}/" + + # remove temp directory + rm -rf "${firmwaretempdir}" } @@ -525,7 +527,8 @@ compile_firmware() compile_armbian-config() { - local tmpdir=$SRC/.tmp/armbian-config_${REVISION}_all + + local tmpdir=$(mktemp -d)/armbian-config_${REVISION}_all display_alert "Building deb" "armbian-config" "info" @@ -563,6 +566,7 @@ compile_armbian-config() fakeroot dpkg -b "${tmpdir}" >/dev/null mv "${tmpdir}.deb" "${DEB_STORAGE}/" rm -rf "${tmpdir}" + } diff --git a/lib/desktop.sh b/lib/desktop.sh index a45843e24b76..bf8ad530c542 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -19,7 +19,7 @@ create_desktop_package () PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS// /,}; PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS//[[:space:]]/} - local destination=${SRC}/.tmp/${RELEASE}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all + local destination=$(mktemp -d)${RELEASE}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all rm -rf "${destination}" mkdir -p "${destination}"/DEBIAN @@ -114,9 +114,10 @@ create_desktop_package () # create board DEB file display_alert "Building desktop package" "${CHOSEN_DESKTOP}_${REVISION}_all" "info" - fakeroot dpkg-deb -b "${destination}" "${destination}.deb" >/dev/null + mkdir -p "${DEB_STORAGE}/${RELEASE}" - mv "${destination}.deb" "${DEB_STORAGE}/${RELEASE}" + cd "${destination}"; cd .. + fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${CHOSEN_DESKTOP}_${REVISION}_all.deb" >/dev/null # cleanup rm -rf "${destination}" } diff --git a/lib/general.sh b/lib/general.sh index af7d506b65b5..9db3d4e576f6 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -201,7 +201,7 @@ improved_git() local count=1 while [ $count -lt $retries ]; do $realgit "$@" - if [ $? -eq 0 ]; then + if [[ $? -eq 0 || -f .git/index.lock ]]; then retries=0 break fi diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh index e91d3fea4651..88f61b5c4411 100644 --- a/lib/makeboarddeb.sh +++ b/lib/makeboarddeb.sh @@ -17,9 +17,10 @@ create_board_package() { display_alert "Creating board support package" "$BOARD $BRANCH" "info" - local destination=$SRC/.tmp/${RELEASE}/${CHOSEN_ROOTFS}_${REVISION}_${ARCH} + local destination=$(mktemp -d)/${RELEASE}/${CHOSEN_ROOTFS}_${REVISION}_${ARCH} rm -rf "${destination}" mkdir -p "${destination}"/DEBIAN + cd $destination # install copy of boot script & environment file local bootscript_src=${BOOTSCRIPT%%:*} @@ -254,7 +255,7 @@ fi #EOF # copy common files from a premade directory structure - rsync -a "${SRC}"/packages/bsp/common/* "${destination}"/ + rsync -a ${SRC}/packages/bsp/common/* ${destination} # trigger uInitrd creation after installation, to apply # /etc/initramfs/post-update.d/99-uboot