From 1756fde7ded1f5fda373f28c9e3937961246ec45 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 1 Apr 2017 22:26:52 +0200 Subject: [PATCH 1/7] facilitate logging on chroot-script calls --- zlibs/helpers | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/zlibs/helpers b/zlibs/helpers index 5a40745..fe81321 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -255,22 +255,35 @@ chroot-script() { req=(strapdir) ckreq || return 1 + mkdir -p "$R/log" case "x$1" in x-d) local script="$2" devprocsys mount "$strapdir" || zerr dpkgdivert on "$strapdir" || zerr + + ## logging + sudo sed -i "$strapdir/$script" \ + -e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log@' notice "chrooting to execute $script..." sudo chmod +x "$strapdir/$script" || zerr sudo -E chroot "$strapdir" "/$script" || zerr + sudo mv -f "$strapdir/${script}.log" "$R/log/" + dpkgdivert off "$strapdir" || zerr devprocsys umount "$strapdir" || zerr ;; *) local script="$1" + + ## logging + sudo sed -i "$strapdir/$script" \ + -e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log@' + notice "chrooting to execute $script..." sudo chmod +x "$strapdir/$script" || zerr sudo -E chroot "$strapdir" "/$script" || zerr + sudo mv -f "$strapdir/${script}.log" "$R/log/" ;; esac From 44bd8e5b1b31a86c630124533c07540b1a5d3b95 Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 10 Apr 2017 12:19:40 +0200 Subject: [PATCH 2/7] add mlocate as a default --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index a6c722c..3f2ede6 100644 --- a/config +++ b/config @@ -76,6 +76,7 @@ base_packages=( zsh rsync git-core + mlocate ) purge_packages+=( From 3c25285d5c4b6c0f41cdce52aff9f65fdb9739dc Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 12 Apr 2017 16:59:13 +0200 Subject: [PATCH 3/7] support pixz for compressing images faster --- zlibs/imaging | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zlibs/imaging b/zlibs/imaging index 03e7af9..2b8e6a3 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -114,10 +114,12 @@ image_pack_dist() { zerr } - notice "compressing image with xz" + _xz=xz + [[ $(command -v pixz) ]] && _xz=pixz + notice "compressing image with $_xz" silly pushd $workdir - xz -zv ${image_name}.img + $_xz -zv ${image_name}.img notice "generating sha256 for ${image_name}.img.xz" sha256sum ${image_name}.img.xz > ${image_name}.img.xz.sha From 5b791c9ef02f23fe168febe8ce794e0d70038a59 Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 12 Apr 2017 17:14:17 +0200 Subject: [PATCH 4/7] fixup! support pixz for compressing images faster --- zlibs/imaging | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zlibs/imaging b/zlibs/imaging index 2b8e6a3..04dc3e0 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -114,12 +114,12 @@ image_pack_dist() { zerr } - _xz=xz + _xz="xz -zv" [[ $(command -v pixz) ]] && _xz=pixz notice "compressing image with $_xz" silly pushd $workdir - $_xz -zv ${image_name}.img + ${=_xz} ${image_name}.img notice "generating sha256 for ${image_name}.img.xz" sha256sum ${image_name}.img.xz > ${image_name}.img.xz.sha From 063f90079171669f8e59ebf4013d70a75db49962 Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 12 Apr 2017 18:25:34 +0200 Subject: [PATCH 5/7] fix gpt imaging --- zlibs/imaging | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/zlibs/imaging b/zlibs/imaging index 04dc3e0..b508915 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -145,9 +145,11 @@ image_raw_mount() { sudo mount $rootpart $workdir/mnt && \ act "mounted root partition" || zerr - sudo mkdir $workdir/mnt/boot - sudo mount $bootpart $workdir/mnt/boot && \ - act "mounted boot partition" || zerr + [[ "$parted_type" == gpt ]] || { + sudo mkdir $workdir/mnt/boot + sudo mount $bootpart $workdir/mnt/boot && \ + act "mounted boot partition" || zerr + } } image_raw_umount() { @@ -155,8 +157,10 @@ image_raw_umount() { req=(workdir bootpart rootpart) ckreq || return 1 - sudo umount $workdir/mnt/boot && act "unmounted boot partition" || zerr - sleep 1 + [[ "$parted_type" == gpt ]] || { + sudo umount $workdir/mnt/boot && act "unmounted boot partition" || zerr + sleep 1 + } sudo umount $workdir/mnt && act "unmounted root partition" || zerr } From ed9ac4338b9c4e7327954e71a9da4855224e4f1a Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 15 Apr 2017 17:29:36 +0200 Subject: [PATCH 6/7] safety check for unavailable packages when installing $extra_packages --- zlibs/bootstrap | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/zlibs/bootstrap b/zlibs/bootstrap index ff294eb..a2ef358 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -151,6 +151,19 @@ bootstrap_tar_unpack() { cat </dev/null #!/bin/sh apt-get update + +## check if all our extra_packages exist +allpkgs="\$(apt-cache search '.' | cut -d' ' -f1)" +for i in ${extra_packages} ; do + printf "%s" "\$allpkgs" | grep -q "^\$i$" || missing="\$missing \$i" +done + +[ -n "\$missing" ] && { + printf "\033[1;31m[!!] some extra packages don't exist\033[0m\n" + printf "%s\n" "\$missing" + exit 1 +} + apt-get --yes --force-yes upgrade apt-get --yes --force-yes install ${extra_packages} apt-get --yes --force-yes autoremove From 93f015a4a00ed1c42f939f44ded6f84bab7a6246 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 15 Apr 2017 17:36:12 +0200 Subject: [PATCH 7/7] bump version number --- libdevuansdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdevuansdk b/libdevuansdk index 1851096..40eb799 100644 --- a/libdevuansdk +++ b/libdevuansdk @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this source code. If not, see . -libdevuansdk_version="0.4" +libdevuansdk_version="0.5" LIBPATH=${LIBPATH:-$(dirname $0)} source $LIBPATH/config