diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 61 | ||||
| -rwxr-xr-x | src/chroot-tools/librechroot | 39 | ||||
| -rw-r--r-- | src/chroot-tools/mkarchroot.patch | 45 |
3 files changed, 129 insertions, 16 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch index 6b32f2b..2b46ecb 100644 --- a/src/chroot-tools/arch-nspawn.patch +++ b/src/chroot-tools/arch-nspawn.patch @@ -1,5 +1,5 @@ ---- arch-nspawn.in 2015-05-24 19:32:57.117177433 -0600 -+++ arch-nspawn.ugly 2015-05-24 23:40:04.031482147 -0600 +--- arch-nspawn.in 2016-05-09 18:37:11.684488405 -0400 ++++ arch-nspawn.ugly 2016-05-09 22:36:00.821147136 -0400 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -7,16 +7,61 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -@@ -88,10 +90,11 @@ - if [[ ! -f "$working_dir/.arch-chroot" ]]; then - die "'%s' does not appear to be an Arch chroot." "$working_dir" - elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then -- die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" -+ die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" +@@ -14,6 +16,8 @@ + + working_dir='' + ++files=() ++ + usage() { + echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" + echo "A wrapper around systemd-nspawn. Provides support for pacman." +@@ -22,17 +26,21 @@ + echo ' -C <file> Location of a pacman config file' + echo ' -M <file> Location of a makepkg config file' + echo ' -c <dir> Set pacman cache' ++ echo ' -f <file> Copy file from the host to the chroot' ++ echo ' -s Do not run setarch' + echo ' -h This message' + exit 1 + } + + orig_argv=("$@") + +-while getopts 'hC:M:c:' arg; do ++while getopts 'hC:M:c:f:s' arg; do + case "$arg" in + C) pac_conf="$OPTARG" ;; + M) makepkg_conf="$OPTARG" ;; + c) cache_dir="$OPTARG" ;; ++ f) files+=("$OPTARG") ;; ++ s) nosetarch=1 ;; + h|?) usage ;; + *) error "invalid argument '%s'" "$arg"; usage ;; + esac +@@ -78,6 +86,12 @@ + [[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf" + [[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf" + ++ local file ++ for file in "${files[@]}"; do ++ mkdir -p "$(dirname "$working_dir$file")" ++ cp -T "$file" "$working_dir$file" ++ done ++ + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf" + } + # }}} +@@ -92,9 +106,12 @@ fi build_mount_args +cache_dirs+=('/repo/') copy_hostconf ++if [[ -z $nosetarch ]]; then eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") ++fi + + exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ + -D "$working_dir" \ diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index e6b3a3a..cc416d5 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -49,28 +49,59 @@ readonly _makechrootpkg="$(librelib chroot/makechrootpkg.sh)" arch_nspawn_flags=() sysd_nspawn_flags=() +hack_arch_nspawn_flags() { + local copydir="$1" + + local makepkg_conf="$copydir/etc/makepkg.conf" + + OPTIND=1 + set -- ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} + while getopts 'hC:M:c:f:s' arg; do + case "$arg" in + M) makepkg_conf="$OPTARG" ;; + *) :;; + esac + done + + local CARCH + if [[ -f "$makepkg_conf" ]]; then + eval $(grep '^CARCH=' "$makepkg_conf") + else + CARCH="$(uname -m)" + fi + + if [[ "$CARCH" == armv7h ]] && ! setarch armv7l 2>/dev/null; then + arch_nspawn_flags+=(-f /usr/bin/qemu-arm-static -s) + fi +} + # Usage: arch-nspawn $copydir $cmd... -arch-nspawn() { +arch-nspawn() ( local copydir=$1; shift local cmd=("$@") + hack_arch_nspawn_flags "$copydir" + "$_arch_nspawn" \ ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} \ "$copydir" \ ${sysd_nspawn_flags+"${sysd_nspawn_flags[@]}"} \ -- \ "${cmd[@]}" -} +) # Usage: mkarchroot $copydir $pkgs... -mkarchroot() { +mkarchroot() ( local copydir=$1; shift local pkgs=("$@") + + hack_arch_nspawn_flags "$copydir" + unshare -m "$_mkarchroot" \ ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} \ "$copydir" \ "${pkgs[@]}" -} +) # Usage: _makechrootpkg $function $arguments... # Don't load $_makechrootpkg directly because it doesn't work with -euE diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch index cb1acc2..3882ec6 100644 --- a/src/chroot-tools/mkarchroot.patch +++ b/src/chroot-tools/mkarchroot.patch @@ -1,5 +1,5 @@ ---- mkarchroot.in 2014-11-05 18:57:12.175995949 -0500 -+++ mkarchroot.ugly 2014-11-05 18:57:12.209328664 -0500 +--- mkarchroot.in 2016-04-15 17:38:00.221067734 -0400 ++++ mkarchroot.ugly 2016-05-09 22:36:18.284175885 -0400 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -7,10 +7,46 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -@@ -68,6 +70,11 @@ +@@ -14,23 +16,29 @@ + + working_dir='' + ++files=() ++ + usage() { + echo "Usage: ${0##*/} [options] working-dir package-list..." + echo ' options:' + echo ' -C <file> Location of a pacman config file' + echo ' -M <file> Location of a makepkg config file' + echo ' -c <dir> Set pacman cache' ++ echo ' -f <file> Copy file from the host to the chroot' ++ echo ' -s Do not run setarch' + echo ' -h This message' + exit 1 + } + + orig_argv=("$@") + +-while getopts 'hC:M:c:' arg; do ++while getopts 'hC:M:c:f:s' arg; do + case "$arg" in + C) pac_conf="$OPTARG" ;; + M) makepkg_conf="$OPTARG" ;; + c) cache_dir="$OPTARG" ;; ++ f) files+=("$OPTARG") ;; ++ s) nosetarch=1 ;; + h|?) usage ;; + *) error "invalid argument '%s'" "$arg"; usage ;; + esac +@@ -68,6 +76,16 @@ chmod 0755 "$working_dir" fi ++for file in "${files[@]}"; do ++ mkdir -p "$(dirname "$working_dir$file")" ++ cp "$file" "$working_dir$file" ++done ++ +_env=() +while read -r varname; do + _env+=("$varname=${!varname}") @@ -19,12 +55,13 @@ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' -@@ -75,7 +82,7 @@ +@@ -75,7 +93,8 @@ echo 'LANG=C' > "$working_dir/etc/locale.conf" echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" -exec arch-nspawn \ +exec "$(librelib chroot/arch-nspawn)" \ ++ ${nosetarch:+-s} \ ${pac_conf:+-C "$pac_conf"} \ ${makepkg_conf:+-M "$makepkg_conf"} \ ${cache_dir:+-c "$cache_dir"} \ |