- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] [mkinitcpio] Fix -k /path when -b is used
by Gerardo Exequiel Pozzi 02 Jul '11

02 Jul '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkinitcpio | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index dec139b..d4ebf94 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -82,7 +82,7 @@ get_kernver() { return 0 fi - [[ -r "$kernel" ]] || return 1 + [[ -r "$BASEDIR$kernel" ]] || return 1 read _ kernver < <(file -b "$BASEDIR$kernel" | grep -o 'version [^ ]\+') if [[ "$kernver" && -e "$BASEDIR/lib/modules/$kernver" ]]; then -- 1.7.6

2 2

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-16-gda81935
by thomas＠archlinux.org 02 Jul '11

02 Jul '11

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 da81935dbb203340e9f3b394d4f6f4e5b3aa63c4 (commit) via 491a99b8a2531207121d651d8e4b15fe4febbd2b (commit) via 3d42f00ecb01206e27640a40616ca51c71153624 (commit) via c46d8a260d276083092b4a46b049b6aa48a1fdbb (commit) from 712b70757e272e5b41c07a17993ccbb43e7ff84c (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 da81935dbb203340e9f3b394d4f6f4e5b3aa63c4 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sat Jul 2 13:42:25 2011 +0200 Trim leading spaces in MODULES and earlymodules to prevent error messages when one is set to " " commit 491a99b8a2531207121d651d8e4b15fe4febbd2b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 12:07:46 2011 -0400 install modules all at once build an array of paths to modules, and install them all at once with mkdir -p and cp --parents. Cuts back on our major source of calls to install(1). This is a tad ugly in that it creates some amount of data duplication, keeping an array of paths in addition to module names. However, turns out to be a worthwhile tradeoff as merging the two datasets into one results in the need for massive string trimming. commit 3d42f00ecb01206e27640a40616ca51c71153624 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 21:19:11 2011 -0400 functions: reorg, no code changes Mostly, this groups "private" functions together, separate from public functions. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c46d8a260d276083092b4a46b049b6aa48a1fdbb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 21:11:13 2011 -0400 always exit from cleanup There's no use case for us calling cleanup without exiting afterwards, so we can simplify all of our cleanup;exit; calls into just cleanup. This means our sighandler is no longer needed (it wasn't really, to begin with), but we split it up to make sure we exit with a posix-ish 128+signum exit value. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 170 ++++++++++++++++++++++++++++++------------------------------ init | 7 ++- mkinitcpio | 29 ++++------ 3 files changed, 101 insertions(+), 105 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-12-g712b707
by thomas＠archlinux.org 01 Jul '11

01 Jul '11

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 712b70757e272e5b41c07a17993ccbb43e7ff84c (commit) via b088a105a7aca2f725168393eaee4e6c19cec784 (commit) via ff378318f68224e2568073faa364ad6a327416e8 (commit) via f7ce8941ea55af8f2268575441030728be82d266 (commit) via 2a61a03293b2c2f79f81b792e006d5523a6f7678 (commit) via 8ad503a7866066162828796c66489070d661dc44 (commit) via 549af8c1b9a72cacf8cda41f8dd4b76983930945 (commit) from 726ff1f9466847cbe27e807cf79560070651781c (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 712b70757e272e5b41c07a17993ccbb43e7ff84c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 11:38:22 2011 -0400 functions: call _add_file directly from add_module This avoids an expensive stat call and some other unnecessary path juggling. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b088a105a7aca2f725168393eaee4e6c19cec784 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 11:06:54 2011 -0400 function: fix whitespace errors Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ff378318f68224e2568073faa364ad6a327416e8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 08:31:52 2011 -0400 lsinitcpio: add optional colorized output Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f7ce8941ea55af8f2268575441030728be82d266 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 1 08:22:41 2011 -0400 lsinitcpio: append, not overwrite found hooks Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 2a61a03293b2c2f79f81b792e006d5523a6f7678 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 23:05:54 2011 -0400 mkinitcpio: use msg instead of echo for hook help Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8ad503a7866066162828796c66489070d661dc44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 19:30:58 2011 -0400 avoid touching the linker directly Much to my chagrin, we're going back to using ldd directly, as it's otherwise too difficult to account for odd setups, such as idiots wanting to create multilib initramfs images, or more commonly -- a 64 bit kernel on a 32 bit userland. Fortunately, we don't suffer too large a regression in speed compared to the previous implementation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 549af8c1b9a72cacf8cda41f8dd4b76983930945 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 19:06:13 2011 -0400 functions: reduce calls to modinfo Cut back to a single call to modinfo, instead of 3, which yields roughly a 30% decrease in execution time for a single run of add_module. This of course varies by module but it's an overall win. Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++- functions | 103 ++++++++++++++++++++++++++++-------------------------------- lsinitcpio | 61 +++++++++++++++++++++++++---------- mkinitcpio | 20 +---------- 4 files changed, 97 insertions(+), 91 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [PATCH] [mkinitcpio] Fix -k /path when -b is used
by Gerardo Exequiel Pozzi 01 Jul '11

01 Jul '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkinitcpio | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 459c828..72a2fb2 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -86,7 +86,7 @@ get_kernver() { return 0 fi - [[ -r "$kernel" ]] || return 1 + [[ -r "$BASEDIR$kernel" ]] || return 1 read _ kernver < <(file -b "$BASEDIR$kernel" | grep -o 'version [^ ]\+') if [[ "$kernver" && -e "$BASEDIR/lib/modules/$kernver" ]]; then -- 1.7.6

2 2

[arch-projects] [PATCH 1/2] functions: reduce calls to modinfo
by Dave Reisner 01 Jul '11

01 Jul '11

Cut back to a single call to modinfo, instead of 3, which yields roughly a 30% decrease in execution time for a single run of add_module. This of course varies by module but it's an overall win. Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- functions | 51 ++++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 27 deletions(-) diff --git a/functions b/functions index 3e3fee9..706a64f 100644 --- a/functions +++ b/functions @@ -56,14 +56,6 @@ in_array() { return 1 # Not Found } -kmodinfo() { - # A wrapper around modinfo, which is aware of our $BASEDIR and - # $KERNELVERSION - # $@: args to modinfo - - modinfo -b "$BASEDIR" -k "$KERNELVERSION" "$@" 2>/dev/null -} - auto_modules() { # Perform auto detection of modules via sysfs. @@ -171,34 +163,39 @@ add_module() { # discovered and added. # $1: module name - local module path fw dep deps + local module path dep deps field value module=${1%.ko*} # skip expensive stuff if this module has already been added in_array "${module//-/_}" "${ADDED_MODULES[@]}" && return - path=$(kmodinfo -0F filename "$module") - if [[ $path ]]; then - # get module firmware - while read -r -d '' fw; do - if [[ -e "$BASEDIR/lib/firmware/$fw" ]]; then - add_file "/lib/firmware/$fw" - fi - done < <(kmodinfo -0F firmware "$module") - - # get module depends - IFS=',' read -r -d '' -a deps < <(kmodinfo -0F depends "$module") - for dep in "${deps[@]}"; do - add_module "$dep" - done - - ADDED_MODULES+=("${module//-/_}") - add_file "${path#$BASEDIR}" || return - else + while IFS=':= ' read -r -d '' field value; do + case "$field" in + filename) + path=$value + ;; + depends) + IFS=',' read -r -a deps <<< "$value" + for dep in "${deps[@]}"; do + add_module "$dep" + done + ;; + firmware) + if [[ -e "$BASEDIR/lib/firmware/$value" ]]; then + add_file "/lib/firmware/$value" + fi + ;; + esac + done < <(modinfo -b "$BASEDIR" -k "$KERNELVERSION" -0 "$module" 2>/dev/null) + + if [[ -z $path ]]; then error "module '$module' not found" return 1 fi + add_file "${path#$BASEDIR}" + ADDED_MODULES+=("${module//-/_}") + # explicit module depends case "$module" in fat) add_module "nls_cp437" ;; -- 1.7.6

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-5-g726ff1f
by thomas＠archlinux.org 30 Jun '11

30 Jun '11

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 726ff1f9466847cbe27e807cf79560070651781c (commit) from a594ffca592612f9293454198e56d7ea72b75d14 (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 726ff1f9466847cbe27e807cf79560070651781c Author: Thomas Bächler <thomas(a)archlinux.org> Date: Thu Jun 30 22:18:44 2011 +0200 init_functions/default_mount_handler: use -l option for blkid to avoid syntax errors in a later mount command Fixes FS#24969. ----------------------------------------------------------------------- Summary of changes: init_functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-4-ga594ffc
by thomas＠archlinux.org 30 Jun '11

30 Jun '11

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 a594ffca592612f9293454198e56d7ea72b75d14 (commit) via ea07e5a3e7a5fd76b0eb71909ca87ad830cf1be8 (commit) via 197ee5d21d5098ccaeb1d804256ac49c0aad619f (commit) via 7f2b324b93bb152f5b9a1be6d15f12a46e5e9360 (commit) from fe2c62c3c34f67b9acc14297b00120e6f38da44d (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 a594ffca592612f9293454198e56d7ea72b75d14 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 30 15:22:39 2011 -0400 function: return with 0 if we reach the end of add_binary The read loop will intentionally return 1 on EOF, but parse_hook will interpret this as an error, and trip our error handler, reporting a false positive failure. commit ea07e5a3e7a5fd76b0eb71909ca87ad830cf1be8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 23:08:06 2011 -0400 bash-completion: use a PE instead of sed Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 197ee5d21d5098ccaeb1d804256ac49c0aad619f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 23:07:36 2011 -0400 bash-completion: match style to rest of code Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7f2b324b93bb152f5b9a1be6d15f12a46e5e9360 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 23:06:55 2011 -0400 bash-completion: complete -k on kernel images Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: bash-completion | 29 ++++++++++++++++++++++------- functions | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag 0.7 created. 0.7
by thomas＠archlinux.org 30 Jun '11

30 Jun '11

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, 0.7 has been created at 5c2a67dcfa6951f93474a914d7bb3d01936f9361 (tag) tagging fe2c62c3c34f67b9acc14297b00120e6f38da44d (commit) replaces 0.6.15 tagged by Thomas Bächler on Thu Jun 30 19:34:46 2011 +0200 - Log ----------------------------------------------------------------- Release version 0.7 Dave Reisner (52): init: don't attempt modprobe if $MODULES is empty mkinitcpio.conf: s/raid/mdadm/ mkinitcpio: deprecate install() in install hooks dmesg: remove install/hook functions: cleanup and refactor add_binary functions: refactor add_module functions: remove add_device functions: remove add_symlink2 use bsdcpio to create images functions: refactor add_file functions: document hook API mkinitcpio.conf: note implicit support for lzop mkinitcpio: use simple PEs instead of externals mkinitcpio: allow specifying kernel ver as path to image lsinitcpio: new utility to dump contents of images Makefile: refactor and simplify mkinitcpio: bashify preset build loop use consistent vim modelines declare all variables in mkinitcpio mkinitcpio: refactor and bashify early path calculations declare SAVELIST, QUIET, SHOW_AUTOMODS as faux booleans mkinitcpio: remove cruft in getopts loop overhaul output, introducing color functions: refactor add_symlink functions: simplify parse_hook mkinitcpio: bashification, part 1/2 mkinitcpio: bashification, part 2/2 add -t option to specify alternate build directory install/keymap: refactor and bashify mkinitcpio: declare usage as a heredoc remove support for -m to add a startup message install/base: cleanup and simplify functions: remove get_module_name init: declare PATH, remove absolute paths init: remove unnecessary variable declarations mkinitcpio: allow overriding the compression method mkinitcpio: only show usage on request mkinitcpio.5: alphabetize options for easier nav README: update copyright year, add self as author mkinitcpio: catch errors in parse_hook add a PKGBUILD for easier testing from the repo mkinitcpio: allow absolute paths to preset files install/{sata,pata,scsi}: cleanup and simplify properly support $BASEDIR install/autodetect: refactor and simplify hook functions: support $BASEDIR in modprobe Makefile: the Makefile itself is a dep for the manpage functions: add missing 'command' before install functions: s/basedir/BASEDIR/ functions: fix pathing issue with $BASEDIR install/base: use private API call to add config mkinitcpio: fix resolution issues with RTLD Eric Bélanger (1): Added usbinput to default hooks (implements FS#19328) Gerardo Exequiel Pozzi (3): Fix some install hooks due recent change in all_modules() Add missing /etc/bash_completion.d in Makefile Add asciidoc as makedepends in private PKGBUILD. Sebastien Luttringer (6): Add bash completion to mkinitcpio Fix printing of bash usage when asking for a bad hook Print pretty message if no help is defined in hook Use error function instead of echo Add lsinitcpio bash completion Use _get_comp_words_by_ref in bash completion Thomas Bächler (7): Merge branch 'master' of https://github.com/seblu/arch-mkinitcpio into working Remove old '-m' option from bash completion. emove old '-a' option from bash completion and fix '-s' option. Merge branch 'working' Add .gitignore file install/keymap: fix installation ($buildroot -> $BUILDROOT) Release version 0.7 ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.6.15-69-gfe2c62c
by thomas＠archlinux.org 30 Jun '11

30 Jun '11

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 fe2c62c3c34f67b9acc14297b00120e6f38da44d (commit) via b581a6f5acad597c94827e8714c2c8483829565b (commit) via 3e873aec5f20374081581230f76eff874fe6f72c (commit) via 5827cd46456866e8f62be6d25a10d30525880cef (commit) from a745dc047d103547bed4af97c376a93fd8e3d08a (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 fe2c62c3c34f67b9acc14297b00120e6f38da44d Author: Thomas Bächler <thomas(a)archlinux.org> Date: Thu Jun 30 19:34:39 2011 +0200 Release version 0.7 commit b581a6f5acad597c94827e8714c2c8483829565b Author: Thomas Bächler <thomas(a)archlinux.org> Date: Thu Jun 30 19:28:59 2011 +0200 install/keymap: fix installation ($buildroot -> $BUILDROOT) commit 3e873aec5f20374081581230f76eff874fe6f72c Author: Thomas Bächler <thomas(a)archlinux.org> Date: Thu Jun 30 19:19:32 2011 +0200 Add .gitignore file commit 5827cd46456866e8f62be6d25a10d30525880cef Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon Jun 27 19:34:30 2011 -0300 Add asciidoc as makedepends in private PKGBUILD. Avoid: make: a2x: Command not found Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> ----------------------------------------------------------------------- Summary of changes: .gitignore | 4 ++++ Makefile | 2 +- PKGBUILD | 1 + install/keymap | 8 ++++---- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .gitignore hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [initscripts] [PATCH 00/21] Remaining patches rebaised (again)
by Kurt J. Bosch 28 Jun '11

28 Jun '11

Did some reordering/spitting to move the most important and trivial fixes in front. Also rewrote most commit messages. Actually this is my second git rebase ever. Hopefully this one is a bit better then the first. Kurt J. Bosch (21): Fix whitespace functions: Fix indentation rc.sysinit: Fix writing to /dev/urandom rc.sysinit: Fix setting locale Fix '>|' not used allways when redirecting to files Fix local statements missing in ck_depends, ck_pidfile, do_unlock, kill_everything fuctions: Define $fsckret read-only because exposed to hook Add some comments functions: Simplify ck_depends() for statement functions: Simplify kill_everything() omit_pid handling Refactor to get rid of simple if-constucts rc.sysinit: Get rid of eval Move fsck executable check into fsck_all() for consistency Move activate_vgs and crypt stat_busy to the top for consistency functions: Make activate_vgs return 0 if noop for consistency Move export PATH into functions rc.sysinit: Refactor /etc/mtab symlink detection to avoid empty if clause rc.sysinit: Add status output for mtab and dmesg.log creation functions: Clean up positions of run_hook *_{pre,post}* where in pairs functions: Simplify LC_* unsetting Add install_file() for readability functions | 109 ++++++++++++++++++++++++++++------------------------------ rc.shutdown | 6 +-- rc.sysinit | 93 +++++++++++++++++++++++--------------------------- 3 files changed, 98 insertions(+), 110 deletions(-)

2 23