From 7a7530849d756590a89eff35cc459e91932eacb3 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Wed, 16 Dec 2020 11:00:14 +0100 Subject: [PATCH] Revert "Fix moving 'armbian-config_*. deb' and clearing temporary folders (#2455)" This reverts commit f8cd769b46725086e919c96ed4015fb73013cc9a. --- lib/compilation.sh | 52 ++++++++++++++++++++-------------------------- lib/desktop.sh | 6 ++---- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/lib/compilation.sh b/lib/compilation.sh index 2ba3d9810c..2c3534c1d8 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -14,7 +14,7 @@ # compile_uboot # compile_kernel # compile_firmware -# compile_armbian-config +# compile_ambian-config # compile_sunxi_tools # install_rkbin_tools # grab_version @@ -280,7 +280,6 @@ compile_uboot() [[ ! -f $uboottempdir/${uboot_name}.deb ]] && exit_with_error "Building u-boot package failed" rsync --remove-source-files -rq "$uboottempdir/${uboot_name}.deb" "${DEB_STORAGE}/" - rm -rf "$uboottempdir" } compile_kernel() @@ -323,10 +322,8 @@ compile_kernel() version=$(grab_version "$kerneldir") # create linux-source package - with already patched sources - local sources_pkg_dir tmp_src_dir - tmp_src_dir=$(mktemp -d) - trap "rm -rf \"${tmp_src_dir}\" ; exit 0" 0 1 2 3 15 - sources_pkg_dir=${tmp_src_dir}/${CHOSEN_KSRC}_${REVISION}_all + local sources_pkg_dir=$(mktemp -d)/${CHOSEN_KSRC}_${REVISION}_all + trap "rm -rf \"${sources_pkg_dir}\" ; exit 0" 0 1 2 3 15 mkdir -p "${sources_pkg_dir}"/usr/src/ "${sources_pkg_dir}"/usr/share/doc/linux-source-${version}-${LINUXFAMILY} "${sources_pkg_dir}"/DEBIAN if [[ $BUILD_KSRC != no ]]; then @@ -455,7 +452,7 @@ compile_kernel() fakeroot dpkg-deb -z0 -b "${sources_pkg_dir}" "${sources_pkg_dir}.deb" rsync --remove-source-files -rq "${sources_pkg_dir}.deb" "${DEB_STORAGE}/" fi - rm -rf "${tmp_src_dir}" + rm -rf "${sources_pkg_dir}" cd .. || exit # remove firmare image packages here - easier than patching ~40 packaging scripts at once @@ -485,12 +482,10 @@ compile_firmware() plugin_repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" fi - local firmwaretempdir plugin_dir - firmwaretempdir=$(mktemp -d) chmod 700 ${firmwaretempdir} trap "rm -rf \"${firmwaretempdir}\" ; exit 0" 0 1 2 3 15 - plugin_dir="armbian-firmware${FULL}" + local plugin_dir="armbian-firmware${FULL}" mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware" fetch_from_repo "https://github.com/armbian/firmware" "armbian-firmware-git" "branch:master" @@ -538,19 +533,17 @@ compile_firmware() compile_armbian-config() { - local tmp_dir armbian_config_dir - tmp_dir=$(mktemp -d) - chmod 700 ${tmp_dir} - trap "rm -rf \"${tmp_dir}\" ; exit 0" 0 1 2 3 15 - armbian_config_dir=armbian-config_${REVISION}_all + local tmpdir=$(mktemp -d)/armbian-config_${REVISION}_all + chmod 700 ${tmpdir} + trap "rm -rf \"${tmpdir}\" ; exit 0" 0 1 2 3 15 display_alert "Building deb" "armbian-config" "info" fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master" - mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/} + mkdir -p "${tmpdir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/} # set up control file - cat <<-END > "${tmp_dir}/${armbian_config_dir}"/DEBIAN/control + cat <<-END > "${tmpdir}"/DEBIAN/control Package: armbian-config Version: $REVISION Architecture: all @@ -565,20 +558,21 @@ compile_armbian-config() Description: Armbian configuration utility END - install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file - install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmp_dir}/${armbian_config_dir}"/usr/sbin/armbian-config - install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/jobs.sh - install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-submenu "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/submenu.sh - install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/functions.sh - install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions-network "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/functions-network.sh - install -m 755 "${SRC}"/cache/sources/armbian-config/softy "${tmp_dir}/${armbian_config_dir}"/usr/sbin/softy + install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmpdir}"/usr/bin/tv_grab_file + install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmpdir}"/usr/sbin/armbian-config + install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmpdir}"/usr/lib/armbian-config/jobs.sh + install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-submenu "${tmpdir}"/usr/lib/armbian-config/submenu.sh + install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions "${tmpdir}"/usr/lib/armbian-config/functions.sh + install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions-network "${tmpdir}"/usr/lib/armbian-config/functions-network.sh + install -m 755 "${SRC}"/cache/sources/armbian-config/softy "${tmpdir}"/usr/sbin/softy # fallback to replace armbian-config in BSP - ln -sf /usr/sbin/armbian-config "${tmp_dir}/${armbian_config_dir}"/usr/bin/armbian-config - ln -sf /usr/sbin/softy "${tmp_dir}/${armbian_config_dir}"/usr/bin/softy + ln -sf /usr/sbin/armbian-config "${tmpdir}"/usr/bin/armbian-config + ln -sf /usr/sbin/softy "${tmpdir}"/usr/bin/softy + + fakeroot dpkg -b "${tmpdir}" >/dev/null + rsync -rq "${tmpdir}.deb" "${DEB_STORAGE}/" + rm -rf "${tmpdir}" - fakeroot dpkg -b "${tmp_dir}/${armbian_config_dir}" >/dev/null - rsync --remove-source-files -rq "${tmp_dir}/${armbian_config_dir}.deb" "${DEB_STORAGE}/" - rm -rf "${tmp_dir}" } diff --git a/lib/desktop.sh b/lib/desktop.sh index 361ec9ddb8..bf8ad530c5 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -19,9 +19,7 @@ create_desktop_package () PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS// /,}; PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS//[[:space:]]/} - local destination tmp_dir - tmp_dir=$(mktemp -d) - destination=${tmp_dir}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all + local destination=$(mktemp -d)${RELEASE}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all rm -rf "${destination}" mkdir -p "${destination}"/DEBIAN @@ -121,7 +119,7 @@ create_desktop_package () cd "${destination}"; cd .. fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${CHOSEN_DESKTOP}_${REVISION}_all.deb" >/dev/null # cleanup - rm -rf "${tmp_dir}" + rm -rf "${destination}" } desktop_postinstall ()