diff options
| -rwxr-xr-x | src/build.sh | 8 | ||||
| -rwxr-xr-x | src/build_order.pm | 5 | ||||
| -rwxr-xr-x | src/build_package.sh | 8 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/build.sh b/src/build.sh index 3073c3c..b94b8d3 100755 --- a/src/build.sh +++ b/src/build.sh @@ -34,6 +34,14 @@ build_all () { else printf "$ERROR$name does not exist\n" fi + + # configure shadow here + if [ "$name" = "shadow" ]; + xichroot "$XIB_CHROOT" /usr/sbin/pwconv + xichroot "$XIB_CHROOT" /usr/sbin/grpconv + xichroot "$XIB_CHROOT" "mkdir -p /etc/default" + xichroot "$XIB_CHROOT" "useradd -D --gid 999" + fi done } diff --git a/src/build_order.pm b/src/build_order.pm index 37beb64..606839c 100755 --- a/src/build_order.pm +++ b/src/build_order.pm @@ -50,7 +50,10 @@ sub list_dependencies{ sub list_buildfiles{ my @files = glob("$buildfiles/repo/*/*.xibuild"); # ignore any meta packages during this stage, they can be added later - return grep(!/\/meta\//, @files); + @files = grep(!/\/meta\//, @files); + @files = grep(!/\/skip\//, @files); + + return @files } sub list_meta_pkgs{ diff --git a/src/build_package.sh b/src/build_package.sh index 7ad5919..159155a 100755 --- a/src/build_package.sh +++ b/src/build_package.sh @@ -56,8 +56,8 @@ fetch_source () { if git ls-remote -q $SOURCE $BRANCH &> /dev/null; then # The source is a git repo - git clone $SOURCE . - git checkout $BRANCH + git clone $SOURCE . > /dev/null + git checkout $BRANCH > /dev/null else # The source is a file @@ -133,7 +133,7 @@ prepare || exit 1 echo "==========================BUILD STAGE==========================" build || exit 1 echo "==========================CHECK STAGE==========================" -check +check || exit 1 echo "==========================PACKAGE STAGE==========================" package || exit 1 @@ -158,7 +158,7 @@ package () { cd "$pkg_dest" if [ "$(ls -1 | wc -l)" = "0" ]; then printf " package is empty;" - [ -z "${SOURCE}"] || exit 1; + [ -z "${SOURCE}" ] || exit 1; fi tar -C $pkg_dest -czf $export_pkg ./ } |