- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [PATCHv2 1/3] mkinitcpio: add -d option
by Thomas Bächler 19 Nov '13

19 Nov '13

The -d (--generatedir) option writes the root of the generated image directly to the specified directory. Useful for generating a shutdown-ramfs with mkinitcpio -d /run/initramfs/. --- functions | 35 ++++++++++++++++++----------------- mkinitcpio | 15 ++++++++++----- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/functions b/functions index f0dce80..81a6072 100644 --- a/functions +++ b/functions @@ -627,45 +627,46 @@ initialize_buildroot() { # creates a temporary directory for the buildroot and initialize it with a # basic set of necessary directories and symlinks - local workdir= kernver=$1 arch=$(uname -m) + local workdir= kernver=$1 arch=$(uname -m) buildroot if ! workdir=$(mktemp -d --tmpdir mkinitcpio.XXXXXX); then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" return 1 fi + buildroot=${2:-$workdir/root} # base directory structure - install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} - ln -s "usr/lib" "$workdir/root/lib" - ln -s "../lib" "$workdir/root/usr/local/lib" - ln -s "bin" "$workdir/root/usr/sbin" - ln -s "usr/bin" "$workdir/root/bin" - ln -s "usr/bin" "$workdir/root/sbin" - ln -s "../bin" "$workdir/root/usr/local/bin" - ln -s "../bin" "$workdir/root/usr/local/sbin" + install -dm755 "$buildroot"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} + ln -s "usr/lib" "$buildroot/lib" + ln -s "../lib" "$buildroot/usr/local/lib" + ln -s "bin" "$buildroot/usr/sbin" + ln -s "usr/bin" "$buildroot/bin" + ln -s "usr/bin" "$buildroot/sbin" + ln -s "../bin" "$buildroot/usr/local/bin" + ln -s "../bin" "$buildroot/usr/local/sbin" case $arch in x86_64) - ln -s "lib" "$workdir/root/usr/lib64" - ln -s "usr/lib" "$workdir/root/lib64" + ln -s "lib" "$buildroot/usr/lib64" + ln -s "usr/lib" "$buildroot/lib64" ;; esac # mkinitcpio version stamp - printf '%s' "$version" >"$workdir/root/VERSION" + printf '%s' "$version" >"$buildroot/VERSION" # kernel module dir - install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel" + install -dm755 "$buildroot/usr/lib/modules/$kernver/kernel" # mount tables - ln -s /proc/self/mounts "$workdir/root/etc/mtab" - >"$workdir/root/etc/fstab" + ln -s /proc/self/mounts "$buildroot/etc/mtab" + >"$buildroot/etc/fstab" # indicate that this is an initramfs - >"$workdir/root/etc/initrd-release" + >"$buildroot/etc/initrd-release" # add a blank ld.so.conf to keep ldconfig happy - >"$workdir/root/etc/ld.so.conf" + >"$buildroot/etc/ld.so.conf" printf '%s' "$workdir" } diff --git a/mkinitcpio b/mkinitcpio index 7ce6c5c..30cff6a 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -19,7 +19,7 @@ _d_presets=mkinitcpio.d # options and runtime data _optmoduleroot= _optkver= _optgenimg= -_optcompress= +_optcompress= _opttargetdir= _optshowautomods=0 _optsavetree=0 _optshowmods=0 _optquiet=1 _optcolor=1 _optskiphooks=() _optaddhooks=() _hooks=() _optpreset=() @@ -53,6 +53,7 @@ usage: ${0##*/} [options] -r, --moduleroot <dir> Root directory for modules (default: /) -S, --skiphooks <hooks> Skip specified hooks, comma-separated, during build -s, --save Save build directory. (default: no) + -d, --generatedir <dir> Write generated image into <dir> -t, --builddir <dir> Use DIR as the temporary build directory -V, --version Display version information and exit -v, --verbose Verbose output (default: no) @@ -298,10 +299,10 @@ process_preset() ( trap 'cleanup 130' INT trap 'cleanup 143' TERM -_opt_short='A:c:g:H:hk:nLMPp:r:S:st:Vvz:' +_opt_short='A:c:g:H:hk:nLMPp:r:S:sd:t:Vvz:' _opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'allpresets' - 'preset:' 'skiphooks:' 'save' 'builddir:' 'version' 'verbose' 'compress:') + 'preset:' 'skiphooks:' 'save' 'generatedir:' 'builddir:' 'version' 'verbose' 'compress:') parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit 1 set -- "${OPTRET[@]}" @@ -327,6 +328,10 @@ while :; do -s|--save) _optsavetree=1 ;; + -d|--generatedir) + shift + _opttargetdir=$1 + ;; -g|--generate) shift [[ -d $1 ]] && die "Invalid image path -- must not be a directory" @@ -414,8 +419,8 @@ KERNELVERSION=$(resolve_kernver "$_optkver") || cleanup 1 _d_kmoduledir=$_optmoduleroot/lib/modules/$KERNELVERSION [[ -d $_d_kmoduledir ]] || die "'$_d_kmoduledir' is not a valid kernel module directory" -_d_workdir=$(initialize_buildroot "$KERNELVERSION") || cleanup 1 -BUILDROOT=$_d_workdir/root +_d_workdir=$(initialize_buildroot "$KERNELVERSION" $_opttargetdir) || cleanup 1 +BUILDROOT=${_opttargetdir:-$_d_workdir/root} . "$_f_config" || die "Failed to read configuration \`%s'" "$_f_config" -- 1.8.4.2

1 2

[arch-projects] [mkinitcpio] [PATCH 1/3] mkinitcpio: add -T option
by Thomas Bächler 19 Nov '13

19 Nov '13

The -T (--targetdirectory) option writes the root of the generated image directly to the specified directory. Useful for generating a shutdown-ramfs with mkinitcpio -T /run/initramfs/. --- functions | 35 ++++++++++++++++++----------------- mkinitcpio | 19 ++++++++++++++----- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/functions b/functions index f0dce80..acec621 100644 --- a/functions +++ b/functions @@ -627,45 +627,46 @@ initialize_buildroot() { # creates a temporary directory for the buildroot and initialize it with a # basic set of necessary directories and symlinks - local workdir= kernver=$1 arch=$(uname -m) + local workdir= kernver=$1 arch=$(uname -m) buildroot=$2 if ! workdir=$(mktemp -d --tmpdir mkinitcpio.XXXXXX); then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" return 1 fi + [[ -z $buildroot ]] && buildroot=$workdir/root # base directory structure - install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} - ln -s "usr/lib" "$workdir/root/lib" - ln -s "../lib" "$workdir/root/usr/local/lib" - ln -s "bin" "$workdir/root/usr/sbin" - ln -s "usr/bin" "$workdir/root/bin" - ln -s "usr/bin" "$workdir/root/sbin" - ln -s "../bin" "$workdir/root/usr/local/bin" - ln -s "../bin" "$workdir/root/usr/local/sbin" + install -dm755 "$buildroot"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}} + ln -s "usr/lib" "$buildroot/lib" + ln -s "../lib" "$buildroot/usr/local/lib" + ln -s "bin" "$buildroot/usr/sbin" + ln -s "usr/bin" "$buildroot/bin" + ln -s "usr/bin" "$buildroot/sbin" + ln -s "../bin" "$buildroot/usr/local/bin" + ln -s "../bin" "$buildroot/usr/local/sbin" case $arch in x86_64) - ln -s "lib" "$workdir/root/usr/lib64" - ln -s "usr/lib" "$workdir/root/lib64" + ln -s "lib" "$buildroot/usr/lib64" + ln -s "usr/lib" "$buildroot/lib64" ;; esac # mkinitcpio version stamp - printf '%s' "$version" >"$workdir/root/VERSION" + printf '%s' "$version" >"$buildroot/VERSION" # kernel module dir - install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel" + install -dm755 "$buildroot/usr/lib/modules/$kernver/kernel" # mount tables - ln -s /proc/self/mounts "$workdir/root/etc/mtab" - >"$workdir/root/etc/fstab" + ln -s /proc/self/mounts "$buildroot/etc/mtab" + >"$buildroot/etc/fstab" # indicate that this is an initramfs - >"$workdir/root/etc/initrd-release" + >"$buildroot/etc/initrd-release" # add a blank ld.so.conf to keep ldconfig happy - >"$workdir/root/etc/ld.so.conf" + >"$buildroot/etc/ld.so.conf" printf '%s' "$workdir" } diff --git a/mkinitcpio b/mkinitcpio index 7ce6c5c..489e199 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -19,7 +19,7 @@ _d_presets=mkinitcpio.d # options and runtime data _optmoduleroot= _optkver= _optgenimg= -_optcompress= +_optcompress= _opttargetdir= _optshowautomods=0 _optsavetree=0 _optshowmods=0 _optquiet=1 _optcolor=1 _optskiphooks=() _optaddhooks=() _hooks=() _optpreset=() @@ -53,6 +53,7 @@ usage: ${0##*/} [options] -r, --moduleroot <dir> Root directory for modules (default: /) -S, --skiphooks <hooks> Skip specified hooks, comma-separated, during build -s, --save Save build directory. (default: no) + -T, --targetdirectory <dir> Write generated image into <dir> -t, --builddir <dir> Use DIR as the temporary build directory -V, --version Display version information and exit -v, --verbose Verbose output (default: no) @@ -298,10 +299,10 @@ process_preset() ( trap 'cleanup 130' INT trap 'cleanup 143' TERM -_opt_short='A:c:g:H:hk:nLMPp:r:S:st:Vvz:' +_opt_short='A:c:g:H:hk:nLMPp:r:S:sT:t:Vvz:' _opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'allpresets' - 'preset:' 'skiphooks:' 'save' 'builddir:' 'version' 'verbose' 'compress:') + 'preset:' 'skiphooks:' 'save' 'targetdirectory:' 'builddir:' 'version' 'verbose' 'compress:') parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit 1 set -- "${OPTRET[@]}" @@ -327,6 +328,10 @@ while :; do -s|--save) _optsavetree=1 ;; + -T|--targetdirectory) + shift + _opttargetdir=$1 + ;; -g|--generate) shift [[ -d $1 ]] && die "Invalid image path -- must not be a directory" @@ -414,8 +419,12 @@ KERNELVERSION=$(resolve_kernver "$_optkver") || cleanup 1 _d_kmoduledir=$_optmoduleroot/lib/modules/$KERNELVERSION [[ -d $_d_kmoduledir ]] || die "'$_d_kmoduledir' is not a valid kernel module directory" -_d_workdir=$(initialize_buildroot "$KERNELVERSION") || cleanup 1 -BUILDROOT=$_d_workdir/root +_d_workdir=$(initialize_buildroot "$KERNELVERSION" $_opttargetdir) || cleanup 1 +if [[ -z $_opttargetdir ]]; then + BUILDROOT=$_d_workdir/root +else + BUILDROOT=$_opttargetdir +fi . "$_f_config" || die "Failed to read configuration \`%s'" "$_f_config" -- 1.8.4.2

2 7

[arch-projects] [netctl] hotfix for wifi-menu -o generated wpa profiles
by Jouke Witteveen 18 Nov '13

18 Nov '13

Although it slipped through review on the list and made it past [testing], there is a bug in netctl 1.4 that can prevent automatically generated wireless profiles from working. The bad commit was f5065. I propose adding commit 3dc6d, which fixes the issue, directly as a patch to the package in [core]. WPA profiles generated with `wifi-menu -o` will stop working in 1.4 because the detection of hex keys looks at $key instead of at $Key (capital K). The commit referenced above fixes this issue. If we apply it quickly, we might have it in before the majority of users has upgraded to netctl 1.4. Sorry, - Jouke

2 3

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.4-1-g3dc6d75
by jouke＠archlinux.org 16 Nov '13

16 Nov '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 3dc6d75f5fa4813fe5c998b13582912fffd88159 (commit) from d378bb8d684c62593a4d5cbac9d0ebe4f81fac4b (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 3dc6d75f5fa4813fe5c998b13582912fffd88159 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Nov 16 23:12:11 2013 +0100 Fix typo in detection of hex keys Errata to f5065. $Key has a capital. ----------------------------------------------------------------------- Summary of changes: src/lib/wpa | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20131107 created. 20131107
by pierre＠archlinux.org 07 Nov '13

07 Nov '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 annotated tag, 20131107 has been created at fa93f811f14c592bcee6cf52ba94d349523ed1ea (tag) tagging 40ea1b3ca5c6f6fdbeda230f4048ac7934d68acf (commit) replaces 20131101 tagged by Pierre Schmitz on Thu Nov 7 14:58:01 2013 +0100 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJSe5xtAAoJEH8tQ0uXQeisBAUH/0NX9DycGLU7lus+t5YxZDpd AjvkyPzEczfbsTxKPjnj+LQceDCa1W9PBrKfK9TWbpXkBOAiIekEPi7SKv83yIKC A461DDFYb2FtNlFDL1OAK0unp3x7YLE+D0nXguchigjK1zaOL856yLPDsKVYLSQJ YKjkFqwN77jvEdKBAQTtzlGU1yIa5aSMcnwn+h3iyCr8rvMW5TkTtQ6J/CSj2FvI dW6bbV4xr9RMgfX9IoPixm5Jzd9EfQ3INGu0eDBuBdawsWr0z7oT+6sf7EtABFMJ DVXdIMhk2MYwdchedtr/u2fqSOl/3S7icnY2dj48f21WdVr+S3HwYSO0YkFlkzo= =zUEa -----END PGP SIGNATURE----- Dave Reisner (1): find_cached_package: avoid adding duplicates Jan Alexander Steffens (heftig) (1): makechrootpkg: Don't copy the logpipe Markus M. May (1): FS#37656 - [devtools] add SRCPKGDEST to makechrootpkg Pierre Schmitz (1): Prepare release ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20131101-4-g40ea1b3
by pierre＠archlinux.org 07 Nov '13

07 Nov '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 40ea1b3ca5c6f6fdbeda230f4048ac7934d68acf (commit) via fd1be1b27a4b9639f16cddfc9720d6efcfbba909 (commit) via 8ce6e29add2d6bf40df302a24a17ccad15875c08 (commit) from 1e043445d2fc264efa73089086f6a769183ad52b (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 40ea1b3ca5c6f6fdbeda230f4048ac7934d68acf Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Thu Nov 7 14:57:03 2013 +0100 Prepare release commit fd1be1b27a4b9639f16cddfc9720d6efcfbba909 Author: Markus M. May <mmay(a)javafreedom.org> Date: Wed Nov 6 18:56:50 2013 +0100 FS#37656 - [devtools] add SRCPKGDEST to makechrootpkg Signed-off-by: Markus M. May <mmay(a)javafreedom.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit 8ce6e29add2d6bf40df302a24a17ccad15875c08 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Wed Nov 6 14:58:39 2013 +0100 makechrootpkg: Don't copy the logpipe Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makechrootpkg.in | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [namcap][PATCH] add two rules which check if a PKGBUILD for vcs packages contains the correct makedepends and conflicts array
by Jelle van der Waa 07 Nov '13

07 Nov '13

--- Namcap/rules/__init__.py | 3 ++- Namcap/rules/vcspackages.py | 43 +++++++++++++++++++++++++++++++++++++++++++ namcap-tags | 3 +++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Namcap/rules/vcspackages.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index f7780d2..62c2617 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -60,7 +60,8 @@ from . import ( pkginfo, pkgnameindesc, sfurl, - splitpkgbuild + splitpkgbuild, + vcspackages ) all_rules = {} diff --git a/Namcap/rules/vcspackages.py b/Namcap/rules/vcspackages.py new file mode 100644 index 0000000..041ddf9 --- /dev/null +++ b/Namcap/rules/vcspackages.py @@ -0,0 +1,43 @@ +# +# namcap rules - vcspackages +# Copyright (C) 2013 Jelle van der Waa <jelle(a)vdwaa.nl> +# +# 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; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from Namcap.ruleclass import * + +vcspackages = {'-git': 'git', '-svn': 'subversion', '-bzr': 'bzr', '-hg': 'mercurial' } + +class ConflictsRule(PkgbuildRule): + name = "conflictsrule" + description = "Verifies if a pkgname-vcs package conflicts with pkgname" + def analyze(self, pkginfo, tar): + if 'name' in pkginfo: + if any(pkginfo["name"].endswith(vcs) for vcs in vcspackages) and not "conflicts" in pkginfo: + self.warnings.append(("vcs-package-conflicts", ())) + +class MakedependsRule(PkgbuildRule): + name = "makedependsrule" + description = "Checks if a vcs package has the correct makedepends array" + def analyze(self, pkginfo, tar): + if 'name' in pkginfo: + for vcsname, vcspkg in vcspackages.items(): + if not pkginfo['name'].endswith(vcsname): + continue + if 'makedepends' not in pkginfo or vcspkg not in pkginfo['makedepends']: + self.errors.append(("vcs-package-makedepends-missing %s", vcspkg)) + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 818c7a5..ecde1c0 100644 --- a/namcap-tags +++ b/namcap-tags @@ -77,6 +77,9 @@ use-pkgdir :: Use $pkgdir instead of $startdir/pkg use-srcdir :: Use $srcdir instead of $startdir/src using-dl-sourceforge :: Attempting to use dl sourceforge domain, use downloads.sourceforge.net instead variable-not-array %s :: Variable %s is not an array. +vcs-package-conflicts :: Vcs package should conflict with the non-vcs version +vcs-package-makedepends-missing %s :: Makedepends array should contain '%s' + # dependency tags dependency-already-satisfied %s :: Dependency %s included but already satisfied -- 1.8.4

2 2

[arch-projects] [PATCH] [devtools] add SRCPKGDEST to makechrootpkg
by Markus M. May 06 Nov '13

06 Nov '13

Please find attached the signed patch. Sorry for posting twice ;-) R, Markus

1 0

[arch-projects] FS#37656 - [devtools] add SRCPKGDEST to makechrootpkg
by Markus M. May 06 Nov '13

06 Nov '13

Please find attached a patch to use the SRCPKGDEST Enviroment Variable inside the makechrootpkg ;-) R, Markus

1 0

[arch-projects] [devtools] [PATCH] makechrootpkg: Don't copy the logpipe
by Jan Alexander Steffens (heftig) 06 Nov '13

06 Nov '13

--- makechrootpkg.in | 1 + 1 file changed, 1 insertion(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index a6123be..f5238a4 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -333,6 +333,7 @@ move_products() { done for l in "$copydir"/logdest/*; do + [[ $l == */logpipe.* ]] && continue chown "$src_owner" "$l" mv "$l" "$LOGDEST" done -- 1.8.4.2

1 0