GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-07 05:29:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Fix moving 'armbian-config_*. deb' and clearing temporary folders (#2455)""

Browse source 
This reverts commit 7a7530849d.
This commit is contained in:
Igor Pecovnik 2020-12-19 15:08:55 +01:00
parent 2b627cb36b
commit 583c8ddf6e
2 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lib/compilation.sh
View file

@ -14,7 +14,7 @@
# compile_uboot # compile_uboot
# compile_kernel # compile_kernel
# compile_firmware # compile_firmware
# compile_ambian-config # compile_armbian-config
# compile_sunxi_tools # compile_sunxi_tools
# install_rkbin_tools # install_rkbin_tools
# grab_version # grab_version
@ -280,6 +280,7 @@ compile_uboot()
[[ ! -f $uboottempdir/${uboot_name}.deb ]] && exit_with_error "Building u-boot package failed" [[ ! -f $uboottempdir/${uboot_name}.deb ]] && exit_with_error "Building u-boot package failed"
rsync --remove-source-files -rq "$uboottempdir/${uboot_name}.deb" "${DEB_STORAGE}/" rsync --remove-source-files -rq "$uboottempdir/${uboot_name}.deb" "${DEB_STORAGE}/"
rm -rf "$uboottempdir"
} }
compile_kernel() compile_kernel()
@ -322,8 +323,10 @@ compile_kernel()
version=$(grab_version "$kerneldir") version=$(grab_version "$kerneldir")
# create linux-source package - with already patched sources # create linux-source package - with already patched sources
local sources_pkg_dir=$(mktemp -d)/${CHOSEN_KSRC}_${REVISION}_all local sources_pkg_dir tmp_src_dir
trap "rm -rf \"${sources_pkg_dir}\" ; exit 0" 0 1 2 3 15 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
mkdir -p "${sources_pkg_dir}"/usr/src/ "${sources_pkg_dir}"/usr/share/doc/linux-source-${version}-${LINUXFAMILY} "${sources_pkg_dir}"/DEBIAN 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 if [[ $BUILD_KSRC != no ]]; then
@ -452,7 +455,7 @@ compile_kernel()
fakeroot dpkg-deb -z0 -b "${sources_pkg_dir}" "${sources_pkg_dir}.deb" fakeroot dpkg-deb -z0 -b "${sources_pkg_dir}" "${sources_pkg_dir}.deb"
rsync --remove-source-files -rq "${sources_pkg_dir}.deb" "${DEB_STORAGE}/" rsync --remove-source-files -rq "${sources_pkg_dir}.deb" "${DEB_STORAGE}/"
fi fi
rm -rf "${sources_pkg_dir}" rm -rf "${tmp_src_dir}"
cd .. || exit cd .. || exit
# remove firmare image packages here - easier than patching ~40 packaging scripts at once # remove firmare image packages here - easier than patching ~40 packaging scripts at once
@ -482,10 +485,12 @@ compile_firmware()
plugin_repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" plugin_repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
fi fi
local firmwaretempdir plugin_dir
firmwaretempdir=$(mktemp -d) firmwaretempdir=$(mktemp -d)
chmod 700 ${firmwaretempdir} chmod 700 ${firmwaretempdir}
trap "rm -rf \"${firmwaretempdir}\" ; exit 0" 0 1 2 3 15 trap "rm -rf \"${firmwaretempdir}\" ; exit 0" 0 1 2 3 15
local plugin_dir="armbian-firmware${FULL}" plugin_dir="armbian-firmware${FULL}"
mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware" mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware"
fetch_from_repo "https://github.com/armbian/firmware" "armbian-firmware-git" "branch:master" fetch_from_repo "https://github.com/armbian/firmware" "armbian-firmware-git" "branch:master"
@ -533,17 +538,19 @@ compile_firmware()
compile_armbian-config() compile_armbian-config()
{ {
local tmpdir=$(mktemp -d)/armbian-config_${REVISION}_all local tmp_dir armbian_config_dir
chmod 700 ${tmpdir} tmp_dir=$(mktemp -d)
trap "rm -rf \"${tmpdir}\" ; exit 0" 0 1 2 3 15 chmod 700 ${tmp_dir}
trap "rm -rf \"${tmp_dir}\" ; exit 0" 0 1 2 3 15
armbian_config_dir=armbian-config_${REVISION}_all
display_alert "Building deb" "armbian-config" "info" display_alert "Building deb" "armbian-config" "info"
fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master" fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master"
mkdir -p "${tmpdir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/} mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/}
# set up control file # set up control file
cat <<-END > "${tmpdir}"/DEBIAN/control cat <<-END > "${tmp_dir}/${armbian_config_dir}"/DEBIAN/control
Package: armbian-config Package: armbian-config
Version: $REVISION Version: $REVISION
Architecture: all Architecture: all
@ -558,21 +565,20 @@ compile_armbian-config()
Description: Armbian configuration utility Description: Armbian configuration utility
END END
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/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file
install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmpdir}"/usr/sbin/armbian-config 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 "${tmpdir}"/usr/lib/armbian-config/jobs.sh 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 "${tmpdir}"/usr/lib/armbian-config/submenu.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 "${tmpdir}"/usr/lib/armbian-config/functions.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 "${tmpdir}"/usr/lib/armbian-config/functions-network.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 "${tmpdir}"/usr/sbin/softy install -m 755 "${SRC}"/cache/sources/armbian-config/softy "${tmp_dir}/${armbian_config_dir}"/usr/sbin/softy
# fallback to replace armbian-config in BSP # fallback to replace armbian-config in BSP
ln -sf /usr/sbin/armbian-config "${tmpdir}"/usr/bin/armbian-config ln -sf /usr/sbin/armbian-config "${tmp_dir}/${armbian_config_dir}"/usr/bin/armbian-config
ln -sf /usr/sbin/softy "${tmpdir}"/usr/bin/softy ln -sf /usr/sbin/softy "${tmp_dir}/${armbian_config_dir}"/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}"
} }

6
lib/desktop.sh
View file

@ -19,7 +19,9 @@ create_desktop_package ()
PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS// /,}; PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS// /,};
PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS//[[:space:]]/} PACKAGE_LIST_PREDEPENDS=${PACKAGE_LIST_PREDEPENDS//[[:space:]]/}
local destination=$(mktemp -d)${RELEASE}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all local destination tmp_dir
tmp_dir=$(mktemp -d)
destination=${tmp_dir}/${BOARD}/${CHOSEN_DESKTOP}_${REVISION}_all
rm -rf "${destination}" rm -rf "${destination}"
mkdir -p "${destination}"/DEBIAN mkdir -p "${destination}"/DEBIAN
@ -119,7 +121,7 @@ create_desktop_package ()
cd "${destination}"; cd .. cd "${destination}"; cd ..
fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${CHOSEN_DESKTOP}_${REVISION}_all.deb" >/dev/null fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${CHOSEN_DESKTOP}_${REVISION}_all.deb" >/dev/null
# cleanup # cleanup
rm -rf "${destination}" rm -rf "${tmp_dir}"
} }
desktop_postinstall () desktop_postinstall ()