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

[arch-projects] [devtools][PATCH] Add mountpoint check to btrfs subvol logic
by WorMzy Tykashi 16 Sep '13

16 Sep '13

--- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 8c64ae1..167ee2f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -140,7 +140,7 @@ create_chroot() { slock 8 "$chrootdir/root.lock" "Locking clean chroot" stat_busy "Creating clean working copy [$copy]" - if [[ "$chroottype" == btrfs ]]; then + if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then if [[ -d $copydir ]]; then btrfs subvolume delete "$copydir" >/dev/null || die "Unable to delete subvolume %s" "$copydir" -- 1.8.4

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-7-gb76977e
by dreisner＠archlinux.org 13 Sep '13

13 Sep '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 mkinitcpio repository". The branch, master has been updated via b76977e710cebed3a799f0ac0b25b1a380323745 (commit) via d0cbe1615281a935d492cc1fd7542198f22f71ad (commit) via b5927393d103af9b8b2da80e8636b8aa52f80755 (commit) from 9c1a65a9c82080dec2e52d03613584bbc1340cf0 (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 b76977e710cebed3a799f0ac0b25b1a380323745 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 8 19:50:07 2013 -0400 add mkinitcpio version marker in buildroot creation It doesn't make any sense that this was added during the final image creation. This fixes a subtle bug that would manifest itself if the user archived the build root manually. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d0cbe1615281a935d492cc1fd7542198f22f71ad Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 19:19:12 2013 -0400 lsinitcpio: return success based on echo, not hexdump The impetus for doing this was a bug in util-linux's hexdump which never saw a release. For uniformity, simply echo an empty line here. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit b5927393d103af9b8b2da80e8636b8aa52f80755 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 19:16:58 2013 -0400 lsinitcpio: add support for lz4 compressed image Note that this requires a very recent version of lz4 utilities as it uses lz4, and not the original lz4c tool, in order to be command line API compliant with other compression tools. See upstream discussions: https://code.google.com/p/lz4/issues/detail?id=83 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD | 1 + functions | 3 +++ lsinitcpio | 8 +++++++- mkinitcpio | 3 --- mkinitcpio.conf | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [PATCH 1/3] lsinitcpio: add support for lz4 compressed image
by Dave Reisner 11 Sep '13

11 Sep '13

Note that this requires a very recent version of lz4 utilities as it uses lz4, and not the original lz4c tool, in order to be command line API compliant with other compression tools. See upstream discussions: https://code.google.com/p/lz4/issues/detail?id=83 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- community/lz4-104-1 has this now. PKGBUILD | 1 + lsinitcpio | 7 ++++++- mkinitcpio.conf | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 440e691..89613a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,6 +14,7 @@ makedepends=('asciidoc' 'git' 'sed') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' + 'lz4: Use lz4 compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') backup=(etc/mkinitcpio.conf) diff --git a/lsinitcpio b/lsinitcpio index c1c5e21..5f19326 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -69,7 +69,7 @@ size_to_human() { } detect_filetype() { - case $(hexdump -n 6 -e '"%c"' "$1") in + case $(hexdump -n 6 -e '"%c"' "$1") in '070701') # no compression return @@ -90,6 +90,11 @@ detect_filetype() { return fi + if [[ $(hexdump -n 4 -e '"%x"' "$1") == '184d2204' ]]; then + echo 'lz4' + return + fi + if [[ $(hexdump -n 3 -e '"%c"' "$1") == 'BZh' ]]; then echo 'bzip2' return diff --git a/mkinitcpio.conf b/mkinitcpio.conf index 7616809..c4d5e06 100644 --- a/mkinitcpio.conf +++ b/mkinitcpio.conf @@ -59,6 +59,7 @@ HOOKS="base udev autodetect modconf block filesystems keyboard fsck" #COMPRESSION="lzma" #COMPRESSION="xz" #COMPRESSION="lzop" +#COMPRESSION="lz4" # COMPRESSION_OPTIONS # Additional options for the compressor -- 1.8.4

1 2

[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 10 Sep '13

10 Sep '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..32bbbbb --- /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 pkginfo["name"].endswith(tuple(vcspackages)) and "conflicts" not 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

1 0

[arch-projects] [namcap][PATCH] check if the description is set in a PKGBUILD
by Jelle van der Waa 04 Sep '13

04 Sep '13

--- Namcap/rules/missingvars.py | 7 +++++++ namcap-tags | 1 + 2 files changed, 8 insertions(+) diff --git a/Namcap/rules/missingvars.py b/Namcap/rules/missingvars.py index 90146f3..8211c1b 100644 --- a/Namcap/rules/missingvars.py +++ b/Namcap/rules/missingvars.py @@ -76,4 +76,11 @@ class TagsRule(PkgbuildRule): if maintainertag != 1: self.warnings.append(("missing-maintainer", ())) +class DescSetRule(PkgbuildRule): + name = "descset" + description = "Verifies that the description is set in a PKGBUILD" + def analyze(self, pkginfo, tar): + if "desc" not in pkginfo or len(pkginfo["desc"]) == 0: + self.errors.append(("missing-description", ())) + # vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 818c7a5..bb5f664 100644 --- a/namcap-tags +++ b/namcap-tags @@ -47,6 +47,7 @@ link-level-dependence %s in %s :: Link-level dependence (%s) in file %s lots-of-docs %f :: Package was %.0f%% docs by size; maybe you should split out a docs package mime-cache-not-updated :: Mime-file found. Add "update-mime-database usr/share/mime" to the install file missing-backup-file %s :: File in backup array (%s) not found in package +missing-description :: Missing description in PKGBUILD. missing-contributor :: Missing Contributor tag missing-custom-license-dir usr/share/licenses/%s :: Missing custom license directory (usr/share/licenses/%s) missing-custom-license-file usr/share/licenses/%s/* :: Missing custom license file in package (usr/share/licenses/%s/*) -- 1.8.4

2 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-4-g9c1a65a
by dreisner＠archlinux.org 02 Sep '13

02 Sep '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 mkinitcpio repository". The branch, master has been updated via 9c1a65a9c82080dec2e52d03613584bbc1340cf0 (commit) via 60475ade761e85ef2c1b0f2daef569b134d44fc0 (commit) via 31e5439dd5a78d413a77a79ffa8179815a02570c (commit) via c7a09dbe28380299e46614462d1e4a3d6af6c3f6 (commit) from 449b3e543c6bbc1e9d539ca2298cc5a191b3233a (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 9c1a65a9c82080dec2e52d03613584bbc1340cf0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 27 11:39:58 2013 -0400 mkinitcpio: preserve permissions if run as root Running as non-root is usually for my own dev purposes, but someone might do this and be surprised when a directory/file that needs permissions other than root isn't preserved. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 60475ade761e85ef2c1b0f2daef569b134d44fc0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 27 17:51:31 2013 -0400 rely on libmount defaults for file locations Using --tab-file for findmnt calls is redundant if we can rely on the defaults. Sanitize the environment from any LIBMOUNT_* variables so that we can be sure of what file we're reading. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 31e5439dd5a78d413a77a79ffa8179815a02570c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Aug 21 10:30:11 2013 -0400 autodetect: search for /usr explicitly using -T Doing this oddly results in findmnt never stat(2)'ing the target directory, which might be problematic with stale NFS mounts and maybe autofs. Fixes FS#36629, I suppose. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c7a09dbe28380299e46614462d1e4a3d6af6c3f6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 26 19:51:01 2013 -0400 init: avoid passing empty RD_TIMESTAMP variable Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: init | 1 - install/autodetect | 2 +- mkinitcpio | 9 +++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0