commit 36d32189c9c68f1b9293b34b54d204f11c0443e7
parent 161b95f4201b039f9cd0dc7e3223d6815c1413ca
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Tue, 5 Jan 2021 07:30:17 +0100
Add pivot_root executable to busybox
Diffstat:
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/checksums/boot-image.lst b/checksums/boot-image.lst
@@ -355,6 +355,7 @@
+
boot-image d755 8
boot-image/bin d755 2
boot-image/bin/[ l777 1 ../opt/busybox/bin/[
@@ -573,6 +574,7 @@ boot-image/bin/pidof l777 1 ../opt/busybox/bin/pidof
boot-image/bin/ping l777 1 ../opt/busybox/bin/ping
boot-image/bin/ping6 l777 1 ../opt/busybox/bin/ping6
boot-image/bin/pipe_progress l777 1 ../opt/busybox/bin/pipe_progress
+boot-image/bin/pivot_root l777 1 ../opt/busybox/bin/pivot_root
boot-image/bin/pkill l777 1 ../opt/busybox/bin/pkill
boot-image/bin/pmap l777 1 ../opt/busybox/bin/pmap
boot-image/bin/popmaildir l777 1 ../opt/busybox/bin/popmaildir
@@ -780,7 +782,7 @@ boot-image/opt/busybox/bin/blkdiscard f755 1 0ba78ed3489f83a26b832c6d609fe1c622
boot-image/opt/busybox/bin/blkid f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/blkid
boot-image/opt/busybox/bin/blockdev f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/blockdev
boot-image/opt/busybox/bin/bunzip2 f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/bunzip2
-boot-image/opt/busybox/bin/busybox f755 1 e9e906acc73b99c58bda10836f1d61a20c6e0f8af06b229cbfc6256cfed60f2bfa3af8b8a659c381414c4588d340743a8f5732a2761ef7ea3a8fe55130e1edd6 boot-image/opt/busybox/bin/busybox
+boot-image/opt/busybox/bin/busybox f755 1 9fcc3fb53fdbf54c9919b19efacc3e067f922e81a6ce5f3bcf9ae53864bd906410d67f93b0b5554eb4c49ace93a4c06ab800636f4aef96ab41621337efe9902e boot-image/opt/busybox/bin/busybox
boot-image/opt/busybox/bin/bzcat f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/bzcat
boot-image/opt/busybox/bin/bzip2 f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/bzip2
boot-image/opt/busybox/bin/cal f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/cal
@@ -953,6 +955,7 @@ boot-image/opt/busybox/bin/pidof f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee0
boot-image/opt/busybox/bin/ping f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/ping
boot-image/opt/busybox/bin/ping6 f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/ping6
boot-image/opt/busybox/bin/pipe_progress f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/pipe_progress
+boot-image/opt/busybox/bin/pivot_root f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/pivot_root
boot-image/opt/busybox/bin/pkill f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/pkill
boot-image/opt/busybox/bin/pmap f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/pmap
boot-image/opt/busybox/bin/popmaildir f755 1 0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f boot-image/opt/busybox/bin/popmaildir
diff --git a/checksums/sabotage-opt.sha512 b/checksums/sabotage-opt.sha512
@@ -15,7 +15,7 @@
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/blkid
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/blockdev
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/bunzip2
-e9e906acc73b99c58bda10836f1d61a20c6e0f8af06b229cbfc6256cfed60f2bfa3af8b8a659c381414c4588d340743a8f5732a2761ef7ea3a8fe55130e1edd6 opt/busybox/bin/busybox
+9fcc3fb53fdbf54c9919b19efacc3e067f922e81a6ce5f3bcf9ae53864bd906410d67f93b0b5554eb4c49ace93a4c06ab800636f4aef96ab41621337efe9902e opt/busybox/bin/busybox
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/bzcat
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/bzip2
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/cal
@@ -188,6 +188,7 @@ ec5be98723cd85f163896ae6f2cdbf5b1ec20fc76ad67f4ee3e1f418429b9438fec3776f30c22527
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/ping
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/ping6
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/pipe_progress
+0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/pivot_root
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/pkill
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/pmap
0ba78ed3489f83a26b832c6d609fe1c622dbee071505393b831c155e67cd5b537414a24bd375fd611a0982b498910e6cd629ccf251860662385b62ea0421723f opt/busybox/bin/popmaildir
diff --git a/gen-checksums b/gen-checksums
@@ -2,10 +2,7 @@
set -x
case $0 in (*/*) cd "${0%/*}" || exit $?;; esac
-find >checksums/boot-image.lst.tmp boot-image -printf '\n%p\t%y%m\t%n\t%l\t' -type f -exec sha512sum '{}' \; || exit $?
-sort <checksums/boot-image.lst.tmp >checksums/boot-image.lst.new || exit $?
-rm checksums/boot-image.lst.tmp || exit $?
-mv checksums/boot-image.lst.new checksums/boot-image.lst || exit $?
+./gen-listing boot-image checksums/boot-image.lst || exit $?
( cd boot-image && find opt -type f -exec sha512sum '{}' + ) >checksums/sabotage-opt.sha512.tmp || exit $?
sort -k 2 <checksums/sabotage-opt.sha512.tmp >checksums/sabotage-opt.sha512.new || exit $?
diff --git a/sabotage-pkg/busybox b/sabotage-pkg/busybox
@@ -38,6 +38,7 @@ sed -i 's,__inline,,' ./scripts/kconfig/zconf.hash.c_shipped
sed -i 's/-DBB_BT=AUTOCONF_TIMESTAMP/-DBB_BT=\\"reproducible-build\\"/' Makefile.flags
cp "$K/"busybox.stage1.config config.stage1
+sed -i 's/# CONFIG_PIVOT_ROOT is not set/CONFIG_PIVOT_ROOT=y/' config.stage1
if [ "$DEBUGBUILD" = "1" ] ; then
debugcflags="-O0 -g"
