collect_project: Use e2-su-2.2 _2_3 suffix commands in collect_project

This does not influence reproducibility but may allow us to get rid of the
old _2_2 suffix commands at some time in the future.

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/local/e2build.lua b/local/e2build.lua
index e68344705f27fd9edfeddec2711cc7c1b655818b..eee75870724f2e6c28083b54866d966381d9a39c 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -1038,7 +1038,7 @@ function e2build.collect_project(info, r, return_flags)
                                        e2lib.basename(checksum_file)))
                        end
                        makefile:write(string.format(
-                               "\te2-su-2.2 extract_tar_2_2 $(chroot_path) "..
+                               "\te2-su-2.2 extract_tar_2_3 $(chroot_base) "..
                                "\"tar.gz\" '%s'\n",
                                e2lib.basename(file.location)))
                end

diff --git a/local/make/build.sh b/local/make/build.sh
index 3a9c9af82f39afe6f0ac91a62def2b2a490e6fcd..eab7028663512ff2a038742235f9115cf5d3dba3 100755 (executable)
--- a/local/make/build.sh
+++ b/local/make/build.sh
@@ -35,14 +35,15 @@ if [ "$chroot_arch" == "x86_64" ] &&
        echo >&2 "need x86_64 host to build this project"
        exit 1
 fi
-chroot_path=/tmp/e2build.$RESULT.cp
-e2-su-2.2 remove_chroot_2_2 $chroot_path >/dev/null 2>&1 || true
-mkdir -p $chroot_path
-touch $chroot_path/emlix-chroot
-e2-su-2.2 set_permissions_2_2 $chroot_path
+chroot_base=/tmp/e2build.$RESULT.cp
+chroot_path=$chroot_base/chroot
+e2-su-2.2 remove_chroot_2_3 $chroot_base >/dev/null 2>&1 || true
+mkdir -p $chroot_base/chroot
+touch $chroot_base/e2factory-chroot
+e2-su-2.2 set_permissions_2_3 $chroot_base
 # install chroot groups
 for g in $CHROOT ; do
-       make chroot_path=$chroot_path -C chroot/$g place
+       make chroot_base=$chroot_base -C chroot/$g place
 done
 # install sources
 for s in $SOURCE ; do
@@ -64,15 +65,15 @@ cp -v res/$RESULT/{build-driver,buildrc,build-script} \
 cp -v res/$RESULT/{builtin,env} $chroot_path/tmp/e2/env/
 if [ "$chroot_arch" == "x86_32" ] ; then
        ./linux32 \
-       e2-su-2.2 chroot_2_2 $chroot_path \
+       e2-su-2.2 chroot_2_3 $chroot_base \
        /bin/bash -e -x /tmp/e2/script/build-driver </dev/null
 elif [ "$chroot_arch" == "x86_64" ] ; then
-       e2-su-2.2 chroot_2_2 $chroot_path \
+       e2-su-2.2 chroot_2_3 $chroot_base \
        /bin/bash -e -x /tmp/e2/script/build-driver </dev/null
 fi
 # fetch result
 rm -fr out/$RESULT
 mkdir -p out/$RESULT
 cp -v $chroot_path/tmp/e2/out/* out/$RESULT/
-e2-su-2.2 remove_chroot_2_2 $chroot_path
+e2-su-2.2 remove_chroot_2_3 $chroot_base
 exit 0