August 2013 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [PATCH 1/4] init: avoid passing empty RD_TIMESTAMP variable
by Dave Reisner 29 Aug '13

29 Aug '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- init | 1 - 1 file changed, 1 deletion(-) diff --git a/init b/init index 5c2d751..0f46475 100644 --- a/init +++ b/init @@ -81,7 +81,6 @@ rdlogger_stop exec env -i \ "TERM=$TERM" \ - "RD_TIMESTAMP=$RD_TIMESTAMP" \ /usr/bin/switch_root /new_root $init "$@" # vim: set ft=sh ts=4 sw=4 et: -- 1.8.4

1 3

[arch-projects] [mkinitcpio] Build image into the kernel?
by Greg KH 28 Aug '13

28 Aug '13

Hi all, I was playing around with the kernel cpio image creation, and was wanting to add an already-built cpio image to an already-built kernel image. Instead of writing yet-another-script to do this type of thing, I noticed that mkinitcpio's documentation said that it supported this: Support for the inclusion of the initial ramdisk image in a kernel, thus making a self-contained kernel image possible. But, I couldn't find this option anywhere in the tool. Am I missing something here? Or, is the format of the cpio image that is created, suitable for including in the kernel build process itself (through the kernel config option), what you are referring to with this line? If so, that requires a three-step process: - build the kernel and modules - build the cpio image - rebuild the kernel with the new cpio image specified thanks, greg k-h

2 2

[arch-projects] [devtools] [PATCH] Add support for building bzr packages
by Maxime Gauduin 26 Aug '13

26 Aug '13

Fixes FS#36654: https://bugs.archlinux.org/task/36654. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- makechrootpkg.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index 8c64ae1..b842d2f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -296,6 +296,16 @@ _chrootbuild() { done done + # Same with bzr sources + for dir in /srcdest /startdir; do + cd $dir + for bzrdir in */.bzr; do + rm ${bzrdir%/.bzr} + cp -a ${dir}_host/${bzrdir%/.bzr} . + chown -R nobody ${bzrdir%/.bzr} + done + done + cd /startdir # XXX: Keep PKGBUILD writable for pkgver() -- 1.8.3.4

3 7

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130808-5-ge77242c
by pierre＠archlinux.org 19 Aug '13

19 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via e77242c5393a5004fce42483c66f8256981f6ef5 (commit) from 9c85d116f0425817b4a631e7a693dc5c948e2470 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e77242c5393a5004fce42483c66f8256981f6ef5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 18 20:40:59 2013 -0400 makechrootpkg: add generic support for additional bind mounts Piggyback on systemd-nspawn's --bind and --bind-ro flags to allow arbitrary mount points to be added to the build container. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: makechrootpkg.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCHv2] makechrootpkg: add generic support for additional bind mounts
by Dave Reisner 19 Aug '13

19 Aug '13

Piggyback on systemd-nspawn's --bind and --bind-ro flags to allow arbitrary mount points to be added to the build container. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Resend of an earlier patch, adds the -d and -D options to the getopt string. makechrootpkg.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 1cd08fb..8c64ae1 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -24,6 +24,9 @@ passeddir= declare -a install_pkgs declare -i ret=0 +bindmounts_ro=() +bindmounts_rw=() + copy=$USER [[ -n $SUDO_USER ]] && copy=$SUDO_USER [[ -z "$copy" || $copy = root ]] && copy=copy @@ -48,6 +51,8 @@ usage() { echo 'Flags:' echo '-h This help' echo '-c Clean the chroot before building' + echo '-d <dir> Bind directory into build chroot as read-write' + echo '-D <dir> Bind directory into build chroot as read-only' echo '-u Update the working copy of the chroot before building' echo ' This is useful for rebuilds without dirtying the pristine' echo ' chroot' @@ -61,10 +66,12 @@ usage() { exit 1 } -while getopts 'hcur:I:l:nT' arg; do +while getopts 'hcur:I:l:nTD:d:' arg; do case "$arg" in h) usage ;; c) clean_first=true ;; + D) bindmounts_ro+=(--bind-ro="$OPTARG") ;; + d) bindmounts_rw+=(--bind="$OPTARG") ;; u) update_first=true ;; r) passeddir="$OPTARG" ;; I) install_pkgs+=("$OPTARG") ;; @@ -174,7 +181,9 @@ install_packages() { pkgname="${install_pkg##*/}" cp "$install_pkg" "$copydir/$pkgname" - arch-nspawn "$copydir" pacman -U /$pkgname --noconfirm + arch-nspawn "$copydir" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ + pacman -U /$pkgname --noconfirm (( ret += !! $? )) rm "$copydir/$pkgname" @@ -338,7 +347,9 @@ load_vars /etc/makepkg.conf create_chroot -$update_first && arch-nspawn "$copydir" pacman -Syu --noconfirm +$update_first && arch-nspawn "$copydir" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ + pacman -Syu --noconfirm [[ -n ${install_pkgs[*]} ]] && install_packages @@ -349,6 +360,7 @@ download_sources if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ /chrootbuild then move_products -- 1.8.3.4

1 0

[arch-projects] [devtools] [RFC] makechrootpkg: add generic support for additional bind mounts
by Dave Reisner 18 Aug '13

18 Aug '13

Piggyback on systemd-nspawn's --bind and --bind-ro flags to allow arbitrary mount points to be added to the build container. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is untested, but is the result of a brief exchange I had with Pierre on IRC. It was suggested that we provide generic support for adding bind mounts rather than explicitly adding support for ccache (since all it really requires is the extra bind mount). makechrootpkg.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 1cd08fb..04ed04b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -24,6 +24,9 @@ passeddir= declare -a install_pkgs declare -i ret=0 +bindmounts_ro=() +bindmounts_rw=() + copy=$USER [[ -n $SUDO_USER ]] && copy=$SUDO_USER [[ -z "$copy" || $copy = root ]] && copy=copy @@ -48,6 +51,8 @@ usage() { echo 'Flags:' echo '-h This help' echo '-c Clean the chroot before building' + echo '-d <dir> Bind directory into build chroot as read-write' + echo '-D <dir> Bind directory into build chroot as read-only' echo '-u Update the working copy of the chroot before building' echo ' This is useful for rebuilds without dirtying the pristine' echo ' chroot' @@ -65,6 +70,8 @@ while getopts 'hcur:I:l:nT' arg; do case "$arg" in h) usage ;; c) clean_first=true ;; + D) bindmounts_ro+=(--bind-ro="$OPTARG") ;; + d) bindmounts_rw+=(--bind="$OPTARG") ;; u) update_first=true ;; r) passeddir="$OPTARG" ;; I) install_pkgs+=("$OPTARG") ;; @@ -174,7 +181,9 @@ install_packages() { pkgname="${install_pkg##*/}" cp "$install_pkg" "$copydir/$pkgname" - arch-nspawn "$copydir" pacman -U /$pkgname --noconfirm + arch-nspawn "$copydir" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ + pacman -U /$pkgname --noconfirm (( ret += !! $? )) rm "$copydir/$pkgname" @@ -338,7 +347,9 @@ load_vars /etc/makepkg.conf create_chroot -$update_first && arch-nspawn "$copydir" pacman -Syu --noconfirm +$update_first && arch-nspawn "$copydir" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ + pacman -Syu --noconfirm [[ -n ${install_pkgs[*]} ]] && install_packages @@ -349,6 +360,7 @@ download_sources if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ + "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ /chrootbuild then move_products -- 1.8.3.4

3 2

[arch-projects] [devtools] [PATCH] add ccache support
by Dominik Heidler 18 Aug '13

18 Aug '13

Users can set a ccache directory (which must be writeable by the user nobody) to be mapped to /build/.ccache (which is the directory, that ccache will use in the chroot) Signed-off-by: Dominik Heidler <dheidler(a)gmail.com> --- makechrootpkg.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 1cd08fb..7cf0031 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -21,6 +21,7 @@ run_namcap=false temp_chroot=false chrootdir= passeddir= +ccachedir= declare -a install_pkgs declare -i ret=0 @@ -58,10 +59,11 @@ usage() { echo " Default: $copy" echo '-n Run namcap on the package' echo '-T Build in a temporary directory' + echo '-C <dir> The ccache directory to use' exit 1 } -while getopts 'hcur:I:l:nT' arg; do +while getopts 'hcur:I:l:C:nT' arg; do case "$arg" in h) usage ;; c) clean_first=true ;; @@ -71,6 +73,7 @@ while getopts 'hcur:I:l:nT' arg; do l) copy="$OPTARG" ;; n) run_namcap=true; makepkg_args="$makepkg_args -i" ;; T) temp_chroot=true; copy+="-$$" ;; + C) ccachedir="$OPTARG" ;; *) makepkg_args="$makepkg_args -$arg $OPTARG" ;; esac done @@ -84,6 +87,8 @@ chrootdir=$(readlink -e "$passeddir") [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" +[[ -n $ccachedir && ! -d $ccachedir ]] && die "Invalid path '%s' given for ccache directory" "$ccachedir" + # Detect chrootdir filesystem type chroottype=$(stat -f -c %T "$chrootdir") @@ -349,6 +354,7 @@ download_sources if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ + ${ccachedir:+"--bind=$ccachedir:/build/.ccache"} \ /chrootbuild then move_products -- 1.8.3.4

3 4

[arch-projects] [mkinitcpio] systemd in initramfs
by Thomas Bächler 18 Aug '13

18 Aug '13

The Arch testing/systemd package recently added support for systemd in initramfs. This obsoletes the base, usr, udev and timestamp hooks. So, what about the rest? 0) autodetect, block, filesystems, fsck, keyboard and modconf work exactly as before. 1) mdadm: I see no hope for this hook working on systemd, however the mdadm_udev hook works out of the box. 2) lvm2: This is much simpler now. I created the sd-lvm2 hook, find it here: https://paste.xinu.at/3vezU/ - this works great, although it could be simplified a bit if one uses add_systemd_unit and add_udev_rule. 3) encrypt: I created the sd-encrypt hook, you can find it here: https://paste.xinu.at/8xUYPI/. This changes the command line syntax, the new syntax can be found in the manpage for systemd-cryptsetup-generator. However, the syntax is less powerful than before - for that reason, I added /etc/crypttab.initrd as /etc/crypttab to the initrd, which should support almost everything. There were some problems with adding the same crypttab for initrd and the main system, but that may be my stupiditiy - I hope the separate crypttab is something we can get rid of. 4) shutdown: I removed this from initramfs entirely - I now generate the shutdown ramfs on the fly during shutdown instead of generating one in the initrd. I'll post something when I polished it more. 5) consolefont/keymap: I tried by putting systemd-vconsole-setup to initramfs. Since keymaps are now loaded by loadkeys instead of busybox's setkmap, this had a few problems and I couldn't get it to work yet.

2 10

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130808-4-g9c85d11
by pierre＠archlinux.org 18 Aug '13

18 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 9c85d116f0425817b4a631e7a693dc5c948e2470 (commit) via 914ebe3a74287a7972fd4ba33ce3daa77ff96fc8 (commit) via 7267664ed86d17c63b12f05d10e8ffb33aab4938 (commit) via e0f7c21a68ddd244f99710ab19ac6e70cc32fa20 (commit) from 8dbb02de4f50aeb05c5df2ef8d9c8cf394b4f9ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c85d116f0425817b4a631e7a693dc5c948e2470 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 11 19:36:31 2013 -0400 checkpkg: avoid using PKGEXT to guess tarball name We can't rely on PKGEXT since it's not sourced from a controlled location. Case in point, if a user sets PKGEXT=.pkg.tar.gz, checkpkg fails and offers no easy workaround. Instead, use glob expansion to resolve the name of the tarball, bailing if it can't be found definitively. This involves some refactoring to avoid modifying PWD (which is advisable regardless). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit 914ebe3a74287a7972fd4ba33ce3daa77ff96fc8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 11 18:09:25 2013 -0400 ensure that PKGBUILDs aren't sourced via PATH Fixes FS#36378. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit 7267664ed86d17c63b12f05d10e8ffb33aab4938 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 9 21:33:59 2013 -0400 arch-nspawn: allow oddly named directories This fixes various errors one might encounter when trying to use a build root or cachedir with whitespace in it. Note that the cachedir fix is not a complete one, as pacman's output is unreliable (and not meant for parsing here). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit e0f7c21a68ddd244f99710ab19ac6e70cc32fa20 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 9 21:33:58 2013 -0400 arch-nspawn: avoid escaping mount_args eval is no longer involved in the execution of systemd-nspawn, so we no longer need a layer of escaping on the arguments. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: arch-nspawn.in | 26 +++++++++++--------------- checkpkg.in | 32 +++++++++++++++++--------------- commitpkg.in | 2 +- 3 files changed, 29 insertions(+), 31 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] checkpkg: avoid using PKGEXT to guess tarball name
by Dave Reisner 12 Aug '13

12 Aug '13

We can't rely on PKGEXT since it's not sourced from a controlled location. Case in point, if a user sets PKGEXT=.pkg.tar.gz, checkpkg fails and offers no easy workaround. Instead, use glob expansion to resolve the name of the tarball, bailing if it can't be found definitively. This involves some refactoring to avoid modifying PWD (which is advisable regardless). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Got tired of hacking checkpkg to work on my system... I realize this is somewhat of a sledgehammer approach -- we could just as easily declare the makepkg-x86_64.conf to be "golden" and source that instead, but that might be prone to other issues.... checkpkg.in | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index 54149db..ef46399 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -1,5 +1,7 @@ #!/bin/bash +shopt -s extglob + m4_include(lib/common.sh) # Source makepkg.conf; fail if it is not found @@ -25,15 +27,17 @@ fi STARTDIR=$(pwd) TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX) -cd "$TEMPDIR" for _pkgname in "${pkgname[@]}"; do - pkgfile=${_pkgname}-$(get_full_version $_pkgname)-${CARCH}${PKGEXT} + pkgfile=(${_pkgname}-$(get_full_version $_pkgname)-${CARCH}.pkg.tar?(.?z)) + if (( ${#pkgfile[*]} != 1 )); then + die 'Ambiguous package name: %s\n' "${pkgfile[*]}" + fi if [[ -f "$STARTDIR/$pkgfile" ]]; then - ln -s "$STARTDIR/$pkgfile" "$pkgfile" + ln -s "$STARTDIR/$pkgfile" "$TEMPDIR/$pkgfile" elif [[ -f "$PKGDEST/$pkgfile" ]]; then - ln -s "$PKGDEST/$pkgfile" "$pkgfile" + ln -s "$PKGDEST/$pkgfile" "$TEMPDIR/$pkgfile" else die "File \"$pkgfile\" doesn't exist" fi @@ -58,23 +62,21 @@ for _pkgname in "${pkgname[@]}"; do elif [[ -f "$STARTDIR/$oldpkg" ]]; then ln -s "$STARTDIR/$oldpkg" "$oldpkg" else - curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" + curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" fi fi - bsdtar tf "$oldpkg" | sort > "filelist-$_pkgname-old" - bsdtar tf "$pkgfile" | sort > "filelist-$_pkgname" + bsdtar tf "$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old" + bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname" - sdiff -s "filelist-$_pkgname-old" "filelist-$_pkgname" + sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" - if diff "filelist-$_pkgname-old" "filelist-$_pkgname" | grep '\.so' > /dev/null 2>&1; then - mkdir -p pkg - cd pkg - bsdtar xf ../"$pkgfile" > /dev/null - diff "../filelist-$_pkgname-old" "../filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do + if diff "$TEMPDIR/filelist-$_pkgname"{-old,} | grep '\.so' &>/dev/null; then + mkdir -p "$TEMPDIR/pkg" + bsdtar -C "$TEMPDIR" xf ../"$pkgfile" #> /dev/null + diff "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do echo "${i}: " "$(objdump -p "$i" | grep SONAME)" done - cd .. else msg "No soname differences for $_pkgname." fi -- 1.8.3.4

1 0