July 2016 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v20-4-g8423083
by dreisner＠archlinux.org 29 Jul '16

29 Jul '16

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 mkinitcpio repository". The branch, master has been updated via 8423083e79dc78cccfbf6b461d51e72faf7a586f (commit) via f5129add0eb16c9511c9cb80433fb4568f1e2703 (commit) from b9308a5296fc0dc8da78cd6f02a5af9c38f0a044 (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 8423083e79dc78cccfbf6b461d51e72faf7a586f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 14 15:57:47 2016 -0400 Support version extraction from i[3456]86 kernels Arch might not really support some of these, but mkinitcpio can. commit f5129add0eb16c9511c9cb80433fb4568f1e2703 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 11 22:05:45 2016 -0400 use an associative array to build bsdcpio options This prevents having unquoted expansion in the bsdcpio commandline ----------------------------------------------------------------------- Summary of changes: lsinitcpio | 37 ++++++++++++++++++++++++++----------- mkinitcpio | 4 ++-- 2 files changed, 28 insertions(+), 13 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [devtools] [PATCH v2 1/2] makechrootpkg: explain load_vars
by Alad Wenter 22 Jul '16

22 Jul '16

The way in which makechrootpkg reads variables from makepkg.conf(5) is different from makepkg, in that it reads a subset of defined variables, and only if the were not set in the environment before. Mention this in the usage text. Fixes FS#44827 --- makechrootpkg.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index cd9efce..0b13f0b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -46,6 +46,10 @@ usage() { echo 'command:' echo ' mkarchroot <chrootdir>/root base-devel' echo '' + echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER' + echo 'from makepkg.conf(5), if those variables are not part of the' + echo 'environment.' + echo '' echo "Default makepkg args: ${makepkg_args[*]}" echo '' echo 'Flags:' -- 2.9.0

1 1

[arch-projects] [devtools] [PATCH 1/2] makechrootpkg: specify makepkg.conf with -M
by Alad Wenter 21 Jul '16

21 Jul '16

PKGDEST and other variables can be set in /etc/makepkg.conf and local correspondents in $HOME, with the file in /etc taking precedence. Specifying a default makepkg.conf on the command line (similar to makepkg) allows to change the directory where build products are moved (move_products), without the need to modify the system configuration in /etc/makepkg.conf or rely on sudoers policy. Fixes FS#44827 --- makechrootpkg.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index cd9efce..efb3cdd 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -21,6 +21,7 @@ run_namcap=false temp_chroot=false chrootdir= passeddir= +makepkg_conf=/etc/makepkg.conf declare -a install_pkgs declare -i ret=0 @@ -63,6 +64,7 @@ usage() { echo " Default: $copy" echo '-n Run namcap on the package' echo '-T Build in a temporary directory' + echo '-M Load variables from an alternate config file' exit 1 } @@ -252,7 +254,7 @@ move_products() { orig_argv=("$@") -while getopts 'hcur:I:l:nTD:d:' arg; do +while getopts 'hcur:I:l:nTD:d:M:' arg; do case "$arg" in c) clean_first=true ;; D) bindmounts_ro+=(--bind-ro="$OPTARG") ;; @@ -263,11 +265,13 @@ while getopts 'hcur:I:l:nTD:d:' arg; do l) copy="$OPTARG" ;; n) run_namcap=true; makepkg_args+=(-i) ;; T) temp_chroot=true; copy+="-$$" ;; + M) makepkg_conf="$OPTARG" ;; h|*) usage ;; esac done [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.' +[[ ! -f $makepkg_conf ]] && die "$makepkg_conf does not exist." check_root "$0" "${orig_argv[@]}" @@ -307,7 +311,7 @@ fi umask 0022 load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf" -load_vars /etc/makepkg.conf +load_vars "$makepkg_conf" # Use PKGBUILD directory if these don't exist [[ -d $PKGDEST ]] || PKGDEST=$PWD -- 2.9.0

3 5

[arch-projects] [devtools] [PATCH 1/1] crossrepomove: support core2community and community2core
by Christian Hesse 15 Jul '16

15 Jul '16

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- Makefile | 2 ++ crossrepomove.in | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile b/Makefile index d93fefd..1595776 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,9 @@ ARCHBUILD_LINKS = \ gnome-unstable-x86_64-build CROSSREPOMOVE_LINKS = \ + core2community \ extra2community \ + community2core \ community2extra BASHCOMPLETION_LINKS = \ diff --git a/crossrepomove.in b/crossrepomove.in index d0964e3..67964a7 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -12,12 +12,24 @@ fi pkgbase="${1}" case $scriptname in + core2community) + source_name='packages' + target_name='community' + source_repo='core' + target_repo='community' + ;; extra2community) source_name='packages' target_name='community' source_repo='extra' target_repo='community' ;; + community2core) + source_name='community' + target_name='packages' + source_repo='community' + target_repo='core' + ;; community2extra) source_name='community' target_name='packages' -- 2.9.0

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v20-2-gb9308a5
by dreisner＠archlinux.org 11 Jul '16

11 Jul '16

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 mkinitcpio repository". The branch, master has been updated via b9308a5296fc0dc8da78cd6f02a5af9c38f0a044 (commit) via a089c8622708d5249aa7830590464fb29dc799a4 (commit) from d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c (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 b9308a5296fc0dc8da78cd6f02a5af9c38f0a044 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 6 07:22:16 2016 -0400 refactor parse_cmdline into something more readable This refactors parse_cmdline into a few chunks of code, mainly to separate the work of parsing from the handling of the actual parsed parameters. By default, parse_cmdline_item is used as the callback for handling the parameters, but this could be overriden by other code sourcing init_functions if desirable. Our test harness passes more tests, but we leave behind some expected failures to describe the cases where it still fails. Fortunately I've not yet been able to find any cases which warrant --expect-parse-fail. commit a089c8622708d5249aa7830590464fb29dc799a4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 6 07:05:51 2016 -0400 add test harness for parse_cmdline Some of these tests currently fail including hard failures where the shell quits entirely (this would lead to a kernel panic). A followup commit will rewrite the parse_cmdline function to improve it and fix these deficiencies. ----------------------------------------------------------------------- Summary of changes: Makefile | 3 + init_functions | 175 ++++++++++++++++++++++++------------ test/test_parse_cmdline | 233 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+), 58 deletions(-) create mode 100755 test/test_parse_cmdline hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH 1/2] add test harness for parse_cmdline
by Dave Reisner 07 Jul '16

07 Jul '16

Some of these tests currently fail including hard failures where the shell quits entirely (this would lead to a kernel panic). A followup commit will rewrite the parse_cmdline function to improve it and fix these deficiencies. --- Makefile | 3 + test/test_parse_cmdline | 233 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+) create mode 100755 test/test_parse_cmdline diff --git a/Makefile b/Makefile index 5af0eb2..6c70718 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,9 @@ man/%: man/%.txt Makefile -a manversion=$(VERSION) \ -a manmanual="mkinitcpio manual" $< +check: + @r=0; for t in test/test_*; do $$t || { echo $$t fail; r=1; }; done; exit $$r + clean: $(RM) mkinitcpio-${VERSION}.tar.gz $(MANPAGES) diff --git a/test/test_parse_cmdline b/test/test_parse_cmdline new file mode 100755 index 0000000..9afd9cb --- /dev/null +++ b/test/test_parse_cmdline @@ -0,0 +1,233 @@ +#!/lib/initcpio/busybox ash + +. ./init_functions + +failed=0 +tests=0 + +e_ok=0 +e_parser_failure=2 +e_assertion_failure=130 + +assert() { + local expect_fail= key= expected_value= actual_value + + if [ "$1" = '--expect-fail' ]; then + expect_fail=y + shift + fi + + key=$1 expected_value=$2 + eval actual_value=\$"$1" + + case $actual_value in + $expected_value) + if [ -n "$expect_fail" ]; then + echo "EXPECTED FAIL: $key: expected='$expected_value', got='$actual_value'" + return 1 + fi + ;; + *) + if [ -z "$expect_fail" ]; then + echo "FAIL: $key: expected='$expected_value', got='$actual_value'" + return 1 + fi + ;; + esac + + return 0 +} + +test_parse() { + local flag= cmdline= expect_fail= expect_parse_fail= + + tests=$(( tests + 1 )) + + for flag; do + case $flag in + --expect-fail) + expect_fail='--expect-fail' + shift + ;; + --expect-parse-fail) + expect_parse_fail=y + shift + ;; + *) + break + ;; + esac + done + + cmdline=$1; shift + [ -n "$V" ] && echo "testing cmdline: $cmdline" + + echo "$cmdline" | { + parse_cmdline + + result=0 + while [ "$#" -gt 0 ]; do + key=$1 expected_value=$2 + shift 2 + + assert $expect_fail "$key" "$expected_value" || result=$e_assertion_failure + done + + exit "$result" + } 2>/dev/null + + case $? in + $e_parser_failure) + # parser failure + if [ -z "$expect_parse_fail" ]; then + echo "FAIL: parse_cmdline failed" + failed=$(( failed + 1 )) + fi + ;; + $e_assertion_failure) + # test assertion failure + failed=$(( failed + 1 )) + ;; + $e_ok) + if [ -n "$expect_parse_fail" ]; then + echo "EXPECTED_FAIL: parse_cmdline succeeded" + failed=$(( failed + 1 )) + fi + ;; + esac +} + +# bare words +test_parse 'foo' \ + 'foo' 'y' +test_parse 'foo bar' \ + 'foo' 'y' \ + 'bar' 'y' + +# overwriting +test_parse 'foo=bar bar=baz foo bar="no pe"' \ + 'bar' 'no pe' \ + 'foo' 'y' + +# simple key=value assignment +test_parse 'foo=bar' \ + 'foo' 'bar' +test_parse 'foo=bar bar=baz' \ + 'foo' 'bar' \ + 'bar' 'baz' +test_parse '_derpy=hooves' \ + '_derpy' 'hooves' +test_parse 'f5=abc f_5_=abc' \ + 'f5' 'abc' \ + 'f_5_' 'abc' +test_parse 'v="foo bar=baz"' \ + 'v' 'foo bar=baz' + +# double quoting +test_parse 'foo="bar"' \ + 'foo' 'bar' +test_parse 'foo="bar baz"' \ + 'foo' 'bar baz' + +# single quoting +test_parse --expect-fail "foo='bar'" \ + 'foo' 'bar' +test_parse --expect-parse-fail "foo='bar baz'" \ + 'foo' 'bar baz' + +# dangling quotes +test_parse --expect-fail 'foo="bar' \ + 'foo' '"bar' +test_parse 'foo=bar"' \ + 'foo' 'bar"' + +# nested quotes +test_parse --expect-parse-fail "foo='\"bar baz\"' herp='\"de\"rp'" \ + 'foo' '"bar baz"' \ + 'herp' '"de"rp' + +# escaped quotes +test_parse 'foo=bar"baz' \ + 'foo' 'bar"baz' + +# neighboring quoted regions +test_parse --expect-fail 'foo="bar""baz"' \ + 'foo' 'barbaz' +test_parse --expect-fail "foo=\"bar\"'baz'" \ + 'foo' "barbaz" +test_parse --expect-fail "foo='bar'\"baz\"" \ + 'foo' "barbaz" + +# comments +test_parse 'foo=bar # ignored content' \ + 'foo' 'bar' \ + 'ignored' '' \ + 'content' '' +test_parse 'foo=bar #ignored content' \ + 'foo' 'bar' \ + 'ignored' '' \ + 'content' '' +test_parse 'foo="bar #baz" parse=this' \ + 'foo' 'bar #baz' \ + 'parse' 'this' + +# shell metachars +test_parse 'foo=*' \ + 'foo' '\*' +test_parse --expect-fail 'Make*' \ + 'Makefile' '' +test_parse --expect-fail '[Makefile]*' \ + 'Makefile' '' \ + 'init' '' \ + 'functions' '' + +# invalid names +test_parse 'in-valid=name' +test_parse '6foo=bar' +test_parse --expect-parse-fail '"gar bage"' \ + 'gar' '' \ + 'bage' '' + +# special handling +test_parse 'rw' \ + 'ro' '' \ + 'rw' '' \ + 'rwopt' 'rw' +test_parse 'ro' \ + 'ro' '' \ + 'rw' '' \ + 'rwopt' 'ro' +test_parse --expect-fail 'fstype=btrfs' \ + 'rootfstype' 'btrfs' +test_parse 'fsck.mode=force' \ + 'forcefsck' 'y' \ + 'fastboot' '' +test_parse 'fsck.mode=skip' \ + 'forcefsck' '' \ + 'fastboot' 'y' +test_parse 'rd.debug' \ + 'rd_debug' 'y' +test_parse 'rd.log' \ + 'rd_logmask' '6' +test_parse 'rd.log=all' \ + 'rd_logmask' '7' +test_parse 'rd.log=console' \ + 'rd_logmask' '4' +test_parse 'rd.log=kmsg' \ + 'rd_logmask' '2' +test_parse 'rd.log=file' \ + 'rd_logmask' '1' + +# a mix of stuff +test_parse 'foo=bar bareword bar="ba az"' \ + 'foo' 'bar' \ + 'bareword' 'y' \ + 'bar' 'ba az' + +if [ "$failed" -eq 0 ]; then + echo "PASS: ${0##*/test_} ($tests tests)" + exit 0 +else + echo "FAIL: $failed tests failed" + exit 1 +fi -- 2.8.3

1 1

[arch-projects] [archweb][PATCH] Fix typo in known_bad help text
by Jelle van der Waa 05 Jul '16

05 Jul '16

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- packages/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/models.py b/packages/models.py index 03f0342..83cc7cb 100644 --- a/packages/models.py +++ b/packages/models.py @@ -86,7 +86,7 @@ class SignoffSpecification(models.Model): enabled = models.BooleanField(default=True, help_text="Is this package eligible for signoffs?") known_bad = models.BooleanField(default=False, - help_text="Is package is known to be broken in some way?") + help_text="Is this package known to be broken in some way?") comments = models.TextField(null=True, blank=True) objects = SignoffSpecificationManager() -- 2.9.0

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag v20 created. v20
by dreisner＠archlinux.org 03 Jul '16

03 Jul '16

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 mkinitcpio repository". The annotated tag, v20 has been created at 19d255722ca6e3eb3ad440d5b59baed613ab4f9e (tag) tagging d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c (commit) replaces v19 tagged by Dave Reisner on Sun Jul 3 14:15:25 2016 -0400 - Log ----------------------------------------------------------------- tag as v20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQE0BAABCAAeBQJXeVY9FxxkcmVpc25lckBhcmNobGludXgub3JnAAoJEB6yY4/1 bAxTroQIAJfsmegBTgwfrxyGqYuv1Gl+p7lfSjSjAr/vjgbAyuOpO1JJbUnHboCJ S92mO4w7p1FVbk6+nWR/Rp1CkwiYS4tup6JBYErwexdlT1qg6RIV+1FtO9WZd2JW 0Hctag4AgejErrfS7uTuHlVLE7/tCwbNFO13ZLQY4R62YFXVlXZapTF2b0VvHLrD //DW4anaXLTfRkus3ORNSryDnMAK2T1sQ6HmpKkdUKlgBIJ3jh8lYtgRColD/HQ6 wKghqetYOQOQuy0CyFjWoJ72gsFt/oxZUIV3Vel3bvrTyDefUXBPm7C/WfrymBnD GuMbEdV2+hOfF06sX2wfhSKkepiL7uw= =UKJN -----END PGP SIGNATURE----- Dave Reisner (6): Handle softdeps in modules handle the case of modinfo returning multiple modules add f2fs quirk for libcrc32c keymap: fall back to us if KEYMAP is not defined init: handle rootfstype as a synonym for fstype error out if asked to extract a kver from image on non-x86 ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v19-6-gd73d34e
by dreisner＠archlinux.org 03 Jul '16

03 Jul '16

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 mkinitcpio repository". The branch, master has been updated via d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c (commit) via 14487ea9a6104c17b00c6fa7bcb65c617c7490c8 (commit) via 89bf8b56137196907b25e9d131e82dec90edaff0 (commit) from 08762d8401ff8e01a3c7a1558e69d5c30c983d20 (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 d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 15:18:11 2016 -0400 error out if asked to extract a kver from image on non-x86 Version extraction only works on x86 (i686 and x86_64) kernels. ref: https://bugs.archlinux.org/task/43256 commit 14487ea9a6104c17b00c6fa7bcb65c617c7490c8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 11:06:50 2016 -0400 init: handle rootfstype as a synonym for fstype rootfstype is handled by the kernel, so we should handle it, too. ref: https://bugs.archlinux.org/task/45117 commit 89bf8b56137196907b25e9d131e82dec90edaff0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 11:02:24 2016 -0400 keymap: fall back to us if KEYMAP is not defined ref: https://bugs.archlinux.org/task/44805 ----------------------------------------------------------------------- Summary of changes: init_functions | 3 ++- install/keymap | 13 ++++--------- man/mkinitcpio.8.txt | 5 +++-- mkinitcpio | 8 +++++++- 4 files changed, 16 insertions(+), 13 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH 1/2] keymap: fall back to us if KEYMAP is not defined
by Dave Reisner 02 Jul '16

02 Jul '16

ref: https://bugs.archlinux.org/task/44805 --- install/keymap | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/install/keymap b/install/keymap index c1948b1..7de6acb 100644 --- a/install/keymap +++ b/install/keymap @@ -14,16 +14,11 @@ build() { [[ $LANG ]] && LOCALE=$LANG LANG=$l - if [[ $KEYMAP ]]; then - if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then - touch "$BUILDROOT/keymap.utf8" - uc=-u - fi - loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin" - else - warning "keymap: hook specified, but no KEYMAP found in configuration" - return 1 + if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then + touch "$BUILDROOT/keymap.utf8" + uc=-u fi + loadkeys -q $uc ${KEYMAP:-us} -b > "$BUILDROOT/keymap.bin" ) && add_runscript } -- 2.8.3

1 1