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

[arch-projects] [DEVTOOLS][PATCH 1/6] makechrootpkg: -I to handle multiple packages
by Sébastien Luttringer 10 Mar '13

10 Mar '13

Since commit cb3a6ce, running makechroot 2 times to insert a package in a build directory require to find a directory without PKGBUILD cd /var/empty makechrootpkg -cu -I virtualbox-host-dkms-*-i686.pkg.tar.xz -r <dir> makechrootpkg -I virtualbox-host-dkms-*-i686.pkg.tar.xz -r <dir> cd - makechrootpkg -n -r <dir> This patch allow makechrootpkg to handle more than one package to be installed before the build is run and simplify the previous case in makechrootpkg -ncu -I virtualbox-host-dkms-*-i686.pkg.tar.xz -I virtualbox-guest-dkms-*-i686.pkg.tar.xz -r <dir> Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- makechrootpkg.in | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index fb91100..9021b3e 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -21,6 +21,7 @@ add_to_db=false run_namcap=false chrootdir= passeddir= +declare -a install_pkgs default_copy=$USER [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER @@ -66,7 +67,7 @@ while getopts 'hcudr:I:l:n' arg; do u) update_first=true ;; d) add_to_db=true ;; r) passeddir="$OPTARG" ;; - I) install_pkg="$OPTARG" ;; + I) install_pkgs+=("$OPTARG") ;; l) copy="$OPTARG" ;; n) run_namcap=true; makepkg_args="$makepkg_args -i" ;; *) makepkg_args="$makepkg_args -$arg $OPTARG" ;; @@ -98,7 +99,7 @@ if (( EUID )); then die 'This script must be run as root.' fi -if [[ ! -f PKGBUILD && -z $install_pkg ]]; then +if [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]]; then die 'This must be run in a directory containing a PKGBUILD.' fi @@ -152,14 +153,17 @@ if [[ ! -d $copydir ]] || $clean_first; then exec 8>&- fi -if [[ -n $install_pkg ]]; then - pkgname="${install_pkg##*/}" - cp "$install_pkg" "$copydir/$pkgname" +if [[ -n "${install_pkgs[*]}" ]]; then + declare -i ret=0 + for install_pkg in "${install_pkgs[@]}"; do + pkgname="${install_pkg##*/}" + cp "$install_pkg" "$copydir/$pkgname" - mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir" - ret=$? + mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir" + (( ret += !! $? )) - rm "$copydir/$pkgname" + rm "$copydir/$pkgname" + done # If there is no PKGBUILD we have done [[ -f PKGBUILD ]] || exit $ret -- Sébastien "Seblu" Luttringer

3 8

[arch-projects] [devtools][PATCH] Use pristine pacman.conf to get preferred mirror
by Connor Behan 10 Mar '13

10 Mar '13

The user's own pacman.conf can be problematic if 'devtools' is part of IgnorePkg. This resulted in the chroot having an empty mirrorlist and therefore a broken build. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- mkarchroot.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkarchroot.in b/mkarchroot.in index 20de5e6..4baf03a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -72,7 +72,7 @@ else cache_dirs=(${cache_dir}) fi -host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirror=$(pacman --config /usr/share/devtools/pacman-extra.conf -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#') if echo "${host_mirror}" | grep -q 'file://'; then host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g') fi -- 1.8.1.4

2 1

[arch-projects] [devtools] [PATCH] makepkg.conf: move -D_FORTIFY_SOURCE=2 to CPPFLAGS
by Dave Reisner 10 Mar '13

10 Mar '13

This never belonged in CFLAGS/CXXFLAGS as it really is a preprocessor flag. While not necessarily harmful, this can potentially cause software not to build when it fails sanity checks (e.g. curl 7.29.0). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- A similar change will be wanted for core/pacman's makepkg.conf. makepkg-i686.conf | 5 +++-- makepkg-x86_64.conf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index 725c2a2..2104f67 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -29,8 +29,9 @@ CHOST="i686-pc-linux-gnu" #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 4de5c67..214c8fe 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -29,8 +29,9 @@ CHOST="x86_64-unknown-linux-gnu" #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" -- 1.8.1.2

3 2

[arch-projects] [netctl][patch] Remove DAD detection
by Sébastien Luttringer 09 Mar '13

09 Mar '13

DAD detection is detected via the presence of tentative flag in ip command. This flag can only be setted if interface is up (obviously). So, setting an IPv6 address will fail when you: - the cable is not plugged - any interface of a bridge is not set The code was (before rewriting of netctl) reference this bug report: https://bugs.archlinux.org/task/28887 Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- docs/netctl.profile.5.txt | 4 ---- src/lib/ip | 6 ------ 2 files changed, 10 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index efd4fb4..621f624 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -153,10 +153,6 @@ network. In particular, these connection types are +ethernet+, Maximum time, in seconds, to wait for DHCP to be successful. Defaults to ``10`'. -'TimeoutDAD=':: - Maximum time, in seconds, to wait for IPv6's Duplicate Address - Detection to succeed. Defaults to ``3`'. - OPTIONS FOR `ethernet' CONNECTIONS ---------------------------------- diff --git a/src/lib/ip b/src/lib/ip index 8723e5b..263305e 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -130,12 +130,6 @@ ip_set() { esac if [[ $IP6 ]]; then - # Wait for Duplicate Address Detection to finish - if ! timeout_wait "${TimeoutDAD:-3}" '[[ -z "$(ip -6 addr show dev "$Interface" tentative)" ]]'; then - report_error "Duplicate Address Detection is taking too long on interface '$Interface'" - return 1 - fi - # Add static IPv6 routes if [[ $Routes6 ]]; then for route in "${Routes6[@]}"; do -- Sébastien "Seblu" Luttringer

2 8

[arch-projects] [netctl] [patch] Properly terminate wpa_actiond, do not assume preexisting setting for WPADriver in netctl-auto, and clarify documentation
by Leonid Isaev 08 Mar '13

08 Mar '13

docs/netctl.special.7.txt | 5 +++-- src/netctl-auto | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/netctl.special.7.txt b/docs/netctl.special.7.txt index 9520385..d705ac6 100644 --- a/docs/netctl.special.7.txt +++ b/docs/netctl.special.7.txt @@ -45,8 +45,9 @@ netctl-sleep.service:: netctl-auto@<interface>.service:: This unit issues a scan on the interface it is used for and tries to - start a profile for a network it finds. It is targeted to wireless - interfaces. + start a profile for a network it finds. It is targeted at wireless + interfaces. Notice that certain WPA-specific options (e.g. WPADriver) in + the profile are ignored. netctl-ifplugd@<interface>.service:: This unit starts ifplugd on the interface it is used for. It will diff --git a/src/netctl-auto b/src/netctl-auto index a799b4b..b41ce14 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -49,7 +49,7 @@ case $STARTSTOP in done # Start the WPA supplicant - : ${WPADriver:=nl80211,wext} + WPADriver=nl80211,wext WPAOptions+=" -W" if wpa_start "$INTERFACE" "$WPADriver" "$WPA_CONF"; then if $AUTOWIFI -i "$INTERFACE" -P "$PIDFILE" -a "$ACTION_SCRIPT" "$@"; then @@ -60,6 +60,8 @@ case $STARTSTOP in exit 1 ;; stop) + # Kill the $AUTOWIFI daemon before terminating wpa_supplicant + kill -term $(<$PIDFILE) if [[ -e $PROFILE_FILE ]]; then "$SUBR_DIR/network" stop "$(< "$PROFILE_FILE")" && rm -f "$PROFILE_FILE" else -- Leonid Isaev GnuPG key: 0x164B5A6D Fingerprint: C0DF 20D0 C075 C3F1 E1BE 775A A7AE F6CB 164B 5A6D

1 0

[arch-projects] [netctl][PATCH v3] Makefile: sign tarball and add upload target
by Florian Pritz 02 Mar '13

02 Mar '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ad356e8..a01fefa 100644 --- a/Makefile +++ b/Makefile @@ -42,12 +42,16 @@ netctl-$(VERSION).tar.xz: | docs mv src/netctl{.orig,} tar --exclude-vcs --transform "s%^%netctl-$(VERSION)/%" --owner=root --group=root --mtime=./netctl-$(VERSION).tar -rf netctl-$(VERSION).tar docs/*.[1-8] xz netctl-$(VERSION).tar + gpg --detach-sign $@ pkgbuild: PKGBUILD PKGBUILD: netctl-$(VERSION).tar.xz sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum $< | cut -d ' ' -f 1)/" contrib/PKGBUILD > $@ +upload: netctl-$(VERSION).tar.xz + scp $< $<.sig nymeria.archlinux.org:/srv/ftp/other/packages/netctl + clean: $(MAKE) -C docs clean - -@rm -vf PKGBUILD *.xz 2>/dev/null + -@rm -vf PKGBUILD *.xz *.xz.sig 2>/dev/null -- 1.8.1.1

2 2

[arch-projects] [netctl][PATCH] Support dynamically appearing interfaces
by Ivan Shapovalov 02 Mar '13

02 Mar '13

If a profile is WantedBy=multi-user.target, it breaks init sequence if its interface is not immediately available at runtime (e. g. a cell-phone or USB modem). Add a parameter "DynamicProfileStart=" which, if enabled, makes the profile unit wanted by its interface unit (and not multi-user.target). --- docs/netctl.profile.5.txt | 4 ++++ src/netctl | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index efd4fb4..73d99f9 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -85,6 +85,10 @@ GENERAL OPTIONS A command that is executed after a connection is brought down. Similar precautions should be taken as with 'ExecUpPost'. +'DynamicProfileStart=':: + If ``yes`', the profile unit file is wanted by its interface unit file + instead of *multi-user.target*. This is needed if the interface + may appear dynamically (e. g. cell phone modem). IP OPTIONS ---------- diff --git a/src/netctl b/src/netctl index 498b50d..787a621 100755 --- a/src/netctl +++ b/src/netctl @@ -97,8 +97,18 @@ unit_enable() { if [[ -n $After ]]; then printf 'After="netctl(a)%s.service"\n' "${After[@]//\"/\\\"}" >> "$unit" fi - echo "ln -s '$unit' '${unit/system\//system/multi-user.target.wants/}'" - ln -s "$unit" "${unit/system\//system/multi-user.target.wants/}" + + local trigger="multi-user.target" + if is_yes "${DynamicProfileStart:-no}"; then + trigger="sys-subsystem-net-devices-${Interface/-/\\x2d}.device" + fi + + trigger="${unit/system\//system/$trigger.wants/}" + + echo "mkdir -p '$(dirname "$trigger")'" + mkdir -p "$(dirname "$trigger")" + echo "ln -s '$unit' '$trigger'" + ln -s "$unit" "$trigger" systemctl daemon-reload } -- 1.8.1.3

3 13

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 0.6 created. 0.6
by jouke＠archlinux.org 02 Mar '13

02 Mar '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 "Network control utility based on systemd". The annotated tag, 0.6 has been created at d7fea1ee90e546dab5be163b761097ebaa6707a6 (tag) tagging 9db8145b411366eea5654547c24a52c68bbc1c06 (commit) replaces 0.5 tagged by Jouke Witteveen on Sat Mar 2 16:57:07 2013 +0100 - Log ----------------------------------------------------------------- Release 0.6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRMiFbAAoJEFa2H7+CSSwVNnAIAIZ0aC2UdF4AgvgiU3eNjbWc DERHcA+5eJO1LqU6FhNJtLDasZVJhMrPYHGB7xrbtY3HinG4ehXsRle1r7qoCDKr bUD37bed/zGNLIysm2y3a7XyNZlR14Ep3M2FfT9A52Y4iJhAewIzg2XwoN+fsXQM fj42pQoKqRg4Rx56bboQ3Y8nS83mOH0BZLjAUGXSm301+VGfvpYst0sPatDlxIEm 7cW7FiB8Gee4GGwQREu9aSgMt7aaI31QYQgtLWaIe94E5tazjsfTwQEC4a8yCv1t fRNWpqKIsZaCk7m3acX6YR6Aq6XhSlBH7FSc4wEiu68lsSDtu1i8+qf0uniO4Ko= =SYM6 -----END PGP SIGNATURE----- Florian Pritz (1): Makefile: sign tarball and add upload target Ivan Shapovalov (1): Automatically escape dashes in interface names Jouke Witteveen (6): Update documentation Fix rfkill Introduce sleep hook (FS#33829) PKGBUILD: use signed sources Fix special quoting in examples 0.6 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 0.5-8-g9db8145
by jouke＠archlinux.org 02 Mar '13

02 Mar '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 "Network control utility based on systemd". The branch, master has been updated via 9db8145b411366eea5654547c24a52c68bbc1c06 (commit) via 730157d12fd24000a649868518d540b47eb864d2 (commit) via 3f59fd8d7da6bc908ff5381ead6e9ebd96ebaf60 (commit) via 8b1e0d73830183294ab1a46f66b19c2831ce6e73 (commit) from dbc2cb76d631046ddc6039523595eeb962e5f454 (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 9db8145b411366eea5654547c24a52c68bbc1c06 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 2 16:56:04 2013 +0100 0.6 release updates commit 730157d12fd24000a649868518d540b47eb864d2 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 2 16:51:22 2013 +0100 Fix special quoting in examples commit 3f59fd8d7da6bc908ff5381ead6e9ebd96ebaf60 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Feb 27 12:28:41 2013 +0100 PKGBUILD: use signed sources This commit extends 8b1e0. commit 8b1e0d73830183294ab1a46f66b19c2831ce6e73 Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Feb 7 23:01:33 2013 +0100 Makefile: sign tarball and add upload target Signed-off-by: Florian Pritz <bluewind(a)xinu.at> ----------------------------------------------------------------------- Summary of changes: Makefile | 13 ++++++++++--- NEWS | 5 +++++ contrib/PKGBUILD | 5 +++-- docs/examples/wireless-wep | 2 +- docs/examples/wireless-wpa | 3 ++- 5 files changed, 21 insertions(+), 7 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [mkinitcpio][PATCH v2] [WIP] systemd: add systemd hook
by Tom Gundersen 01 Mar '13

01 Mar '13

Note: generate initramfs with HOOKS=('base' 'systemd' 'autodetect' 'block' 'filesystems') This relies on patches patches soon to be posted on the systemd mailinglist. This hook would live in the systemd package, but posting it as a mkinitcpio patch because SVN. Ideally, we would eventaully introduce "add_unit" and "add_rules" functions that would allow us to add a few udev rules and systemd units, and have everything else in this hook (e.g., binaries from RUN= or ExecStart= and other units based on Wants/Requires dependencise) pulled in automatically. v2: don't parse /sysroot/etc for new settings --- install/systemd | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 install/systemd diff --git a/install/systemd b/install/systemd new file mode 100644 index 0000000..2737c81 --- /dev/null +++ b/install/systemd @@ -0,0 +1,63 @@ +#!/bin/bash + +build() { + local rules tool socket service + + # from base + add_binary /bin/mount + + # systemd + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemctl + add_binary /usr/bin/udevadm + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/lib/systemd/systemd-journald + + # generate sysroot.mount and sysroot-usr.mount + add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + + # libdbus needs the passwd info of the root user + # TODO: patch dbus to avoid this hack + add_file "/etc/nsswitch.conf" + add_file "/etc/passwd" + add_file "/lib/libnss_files-2.17.so" + add_symlink "/lib/libnss_files.so.2" "libnss_files-2.17.so" + add_symlink "/lib/libnss_files.so" "libnss_files.so.2" + + # udev rules and systemd units + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules 99-systemd.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + for socket in systemd-udevd-control systemd-udevd-kernel systemd-journald; do + add_file "/usr/lib/systemd/system/$socket.socket" + add_symlink "/usr/lib/systemd/system/sockets.target.wants/$socket.socket" "../$socket.socket" + done + for service in systemd-udevd systemd-udev-trigger systemd-journald; do + add_file "/usr/lib/systemd/system/$service.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/$service.service" "../$service.service" + done + for target in sysinit sockets basic emergency local-fs-pre local-fs swap remote-fs-pre initrd-switch-root; do + add_file "/usr/lib/systemd/system/$target.target" + done + + add_file "/usr/lib/systemd/system/systemd-fsck@.service" + add_file "/usr/lib/systemd/system/systemd-reboot.service" "/usr/lib/systemd/system/ctrl-alt-del.service" + + add_file "/usr/lib/systemd/system/initrd-cleanup.service" + add_symlink "/usr/lib/systemd/system/basic.target.wants/initrd-cleanup.service" "../initrd-cleanup.service" + add_file "/usr/lib/systemd/system/initrd-switch-root.service" + add_file "/usr/lib/systemd/system/initrd-udevadm-cleanup-db.service" + + add_symlink "/usr/lib/systemd/system/default.target" "basic.target" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup on your initrd, you might want to add more hooks to get more advanced functionality. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: -- 1.8.1.4

1 0