Add unpackarchive tool, use it for preinstallation

This makes builds work for non-root users or with no bsdtar installed.
openSUSE · Jul 16, 2021 · ca5bb10 · ca5bb10
1 parent 973e9ec
commit ca5bb10
Show file tree

Hide file tree

Showing 3 changed files with 446 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -75,6 +75,7 @@ install:
 	    spec_add_patch \
 	    spectool \
 	    signdummy \
+	    unpackarchive \
 	    unrpm \
 	    telnet_login_wrapper \
 	    startdockerd \

diff --git a/init_buildsystem b/init_buildsystem
@@ -276,13 +276,15 @@ preinstall() {
     check_exit
     echo "preinstalling $PKG..."
     preinstall_setup
-    if test -x /usr/bin/bsdtar ; then
+    if test "$UID" = 0 -a -x /usr/bin/bsdtar ; then
 	CPIO="/usr/bin/bsdtar --exclude .build --exclude .init_b_cache -P --chroot -o --numeric-owner -x -f-"
 	TAR="/usr/bin/bsdtar --exclude .build --exclude .init_b_cache -P --chroot -o --numeric-owner -x"
     else
-	unsafe_preinstall_check
-	CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet"
-	TAR="tar --exclude .build --exclude .init_b_cache -x"
+#	unsafe_preinstall_check
+#	CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet"
+#	TAR="tar --exclude .build --exclude .init_b_cache -x"
+	CPIO="$BUILD_DIR/unpackarchive --cpio ."
+	TAR="$BUILD_DIR/unpackarchive --tar ."
     fi
     pkg_preinstall
     preinstall_integrate