From 2d7f8dd0def53ba35a2d6382a3dc5a92582dbfd0 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Wed, 13 Jan 2010 15:14:43 +0100 Subject: [PATCH] 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 --- local/e2build.lua | 2 +- local/make/build.sh | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/local/e2build.lua b/local/e2build.lua index e683447..eee7587 100644 --- 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 3a9c9af..eab7028 100755 --- 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