diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 16:40:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 16:40:33 -0400 |
| commit | d5737c43f35d4b70303803f1dabe58c7df6f4fe0 (patch) | |
| tree | dc25086027d6a1bea95517fd33550ad922de80a3 | |
| parent | 14158ad5fc38836854a1a52ed03e6174a4083a96 (diff) | |
Update to a version of devtools based on 20160527.1
| -rw-r--r-- | src/chroot-tools/makechrootpkg.sh.patch | 6 | ||||
| -rw-r--r-- | src/chroot-tools/mkarchroot.patch | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch index d5c6fca..6e5e45a 100644 --- a/src/chroot-tools/makechrootpkg.sh.patch +++ b/src/chroot-tools/makechrootpkg.sh.patch @@ -1,5 +1,5 @@ ---- makechrootpkg.sh.in 2016-02-08 17:17:11.848386338 -0500 -+++ makechrootpkg.sh.ugly 2016-04-14 22:01:05.923288181 -0400 +--- makechrootpkg.sh.in 2016-06-09 16:36:04.300623877 -0400 ++++ makechrootpkg.sh.ugly 2016-06-09 16:36:26.496802844 -0400 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -146,7 +146,7 @@ mkdir -p "$copydir/build" @@ -193,12 +237,12 @@ - printf 'builduser:x:%d:100:builduser:/:/usr/bin/nologin\n' "$builduser_uid" >>"$copydir/etc/passwd" + printf 'builduser:x:%d:100:builduser:/build:/bin/bash\n' "$builduser_uid" >>"$copydir/etc/passwd" chown -R "$builduser_uid" "$copydir"/{build,pkgdest,srcpkgdest,logdest,srcdest,startdir} - if [[ -n $MAKEFLAGS ]]; then diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch index 3882ec6..9fc7b39 100644 --- a/src/chroot-tools/mkarchroot.patch +++ b/src/chroot-tools/mkarchroot.patch @@ -1,5 +1,5 @@ ---- mkarchroot.in 2016-04-15 17:38:00.221067734 -0400 -+++ mkarchroot.ugly 2016-05-09 22:36:18.284175885 -0400 +--- mkarchroot.in 2016-06-09 16:36:04.297290617 -0400 ++++ mkarchroot.ugly 2016-06-09 16:36:26.290140708 -0400 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -55,9 +55,9 @@ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' -@@ -75,7 +93,8 @@ - echo 'LANG=C' > "$working_dir/etc/locale.conf" - echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" +@@ -77,7 +95,8 @@ + + systemd-machine-id-setup --root="$working_dir" -exec arch-nspawn \ +exec "$(librelib chroot/arch-nspawn)" \ |