- Arch-projects - lists.archlinux.org

[arch-projects] [ABS] [PATCH 2/2] Refactor rubygem proto
by Maxime Gauduin 08 Oct '13

08 Oct '13

The previous way of installing a gem left a lot of crust in the system. This refactoring mimics the layout of ruby packages in [community] which are packaged from source. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-rubygem.proto | 42 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/prototypes/PKGBUILD-rubygem.proto b/prototypes/PKGBUILD-rubygem.proto index 84fbd70..303f6b2 100644 --- a/prototypes/PKGBUILD-rubygem.proto +++ b/prototypes/PKGBUILD-rubygem.proto @@ -7,28 +7,46 @@ # information on Ruby Gem packaging. # Maintainer: Your Name <youremail(a)domain.com> -_gemname=GEMNAME -pkgname=ruby-$_gemname +pkgname=ruby-GEM_NAME pkgver=VERSION pkgrel=1 pkgdesc="" -arch=(any) +arch=() url="" license=('GPL') depends=(ruby) # Full dependency information is available in the yaml specification -makedepends=(rubygems) -source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem) -noextract=($_gemname-$pkgver.gem) +makedepends=() +source=("https://rubygems.org/downloads/${pkgname#ruby-}-$pkgver.gem") +noextract=("${pkgname#ruby-}-$pkgver.gem") md5sums=() -package() { +build() { cd "$srcdir" - # _gemdir is defined inside package() because if ruby[gems] is not installed on - # the system, makepkg will exit with an error when sourcing the PKGBUILD. - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ - "$_gemname-$pkgver.gem" + gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#ruby-}-$pkgver.gem +} + +package() { + cd "$srcdir"/gems/${pkgname#ruby-}-$pkgver + + local _rubyver="$(ruby --version | sed 's/.* $.*$p.*/\1/')" + + install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/$_rubyver,vendor_ruby} + mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/$_rubyver + +# Executables + mv bin "${pkgdir}"/usr/ + +# Native extensions + install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/$_rubyver/$CARCH-linux + pushd "${pkgdir}"/usr/lib/ruby/vendor_ruby/$_rubyver/${pkgname#ruby-} + for ext in *.{h,so}; do + mv $ext ../$CARCH-linux/$ext + done + popd + +# Gem compatibility + mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/$_rubyver/ } # vim:set ts=2 sw=2 et: -- 1.8.4

1 0

[arch-projects] [mkinitcpio] [PATCH] Add sd-vconsole hook.
by Thomas Bächler 28 Sep '13

28 Sep '13

This hook works together with the systemd hook from the systemd package and requires the add_systemd_unit function. It launches systemd-vconsole-setup.service in initramfs and is especially useful to unlock encrypted volumes in initramfs. --- install/sd-vconsole | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 install/sd-vconsole diff --git a/install/sd-vconsole b/install/sd-vconsole new file mode 100644 index 0000000..46c3b1e --- /dev/null +++ b/install/sd-vconsole @@ -0,0 +1,67 @@ +#!/bin/bash + +get_decompressor() { + case "$1" in + *.gz) + cat=zcat + of=${f%.gz} + ;; + *.bz2) + cat=bzcat + of=${f%.bz2} + ;; + *) + cat=cat + of=$f + ;; + esac +} + +add_keymap_file() { + local cat cmd file rest f of + + while read f; do + get_decompressor "$f" + while read -r cmd rest; do + if [[ $cmd == include ]]; then + eval set $rest + add_keymap_file "$1" + fi + done < <($cat "$f") + add_dir "${of%/*}" + $cat "$f" > "$BUILDROOT/$of" + done < <(find /usr/share/kbd/keymaps/ -type f -regex ".*/$1$\.inc$?$\.gz\|\.bz2$?") +} + +build() { + add_systemd_unit systemd-vconsole-setup.service + add_binary loadkeys + add_binary setfont + add_file /etc/vconsole.conf + + # subshell to avoid namespace pollution + ( + shopt -s nullglob + + [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf + + [[ $KEYMAP ]] && add_keymap_file $KEYMAP.map + [[ $KEYMAP_TOGGLE ]] && add_keymap_file $KEYMAP_TOGGLE.map + + if [[ $FONT ]]; then + for file in "/usr/share/kbd/consolefonts/$FONT".(a)(fnt|psf?(u))?(.gz); do + get_decompressor "$file" + add_dir "${of%/*}" + $cat "$file" > "$BUILDROOT/$of" + done + fi + ) +} + +help() { + cat <<HELPEOF +This hook loads keymap(s) specified in vconsole.conf during early userspace. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: -- 1.8.4

1 0

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

27 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 344c27a8b56a4aa8bd168f98285165c3fc87cba3 (commit) via 45f176893593aca61f2191b41b24971469f13fce (commit) via 59fe26351634fb85e41d1fdfa39517fbd8cb3930 (commit) via 59c79bda956ccb309d21adfb5afcc19df77a8e0b (commit) via c1e8eb0e130a1f8e9dd8253478a0a626b4f441cc (commit) from b76977e710cebed3a799f0ac0b25b1a380323745 (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 344c27a8b56a4aa8bd168f98285165c3fc87cba3 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Sep 26 15:15:20 2013 +0200 kernel-install: add hook This will allow systemd's kernel-install script to generate and install an initrd as per the freedesktop boot loader specs. See kernel-install(8) for details. Notice that 'profiles' are not used. This will eventually be hooked up so that calling "make install" from a kernel build will do the right thing. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 45f176893593aca61f2191b41b24971469f13fce Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 25 08:46:50 2013 -0400 mkinitcpio.conf(5): mention lz4 compression Since b5927393d103af9, mkinitcpio acknowledges that lz4 exists. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 59fe26351634fb85e41d1fdfa39517fbd8cb3930 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 24 11:04:46 2013 -0400 PKGBUILD: Point to the gitweb page for upstream URL Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 59c79bda956ccb309d21adfb5afcc19df77a8e0b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 21 18:47:53 2013 -0400 autodetect: read modaliases from uevent files As suggested by Harald Hoyer, this is more accurate for the sake of following where udev gets its modaliases from. In some rare cases, it may even be more complete than scraping the raw modalias files. Also, introduce a wrapper around modprobe so that the options passed are never ommitted, or wrongly specified. In this case, a subtle bug with the -r flag is fixed due to using the wrong variable with modprobe's -d flag. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c1e8eb0e130a1f8e9dd8253478a0a626b4f441cc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Sep 20 09:03:46 2013 -0400 functions: always add toplevel dir in add_full_dir Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: 50-mkinitcpio.install | 12 ++++++++++++ Makefile | 3 +++ PKGBUILD | 2 +- functions | 15 +++++++++------ install/autodetect | 3 +-- man/mkinitcpio.conf.5.txt | 6 +++--- 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 50-mkinitcpio.install hooks/post-receive -- The official mkinitcpio repository

1 0

Re: [arch-projects] [pyalpm][PATCH] Strip comments that aren't at the start from pycman.config
by Frostyfrog 22 Sep '13

22 Sep '13

Yes, Lukas is correct. I'm sorry that I wasn't more descriptive (TBH, I just started making a bunch of commits to a git repo, so I'm still learning these things). Also, the purpose of the leading space was because vim recognizes comments as either starting at the beginning of the line, or with a space in front. Example: Architecture = x86_64#Vim doesn't think of this as a comment, and I presume bash doesn't either Architecture = x86_64 #This is considered as a comment to vim Now, to set this mailing list to daily instead of digest >.> ~ *Frostyfrog* ^.^

1 0

[arch-projects] [mkinitcpio] [PATCH 1/2] functions: always add toplevel dir in add_full_dir
by Dave Reisner 22 Sep '13

22 Sep '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- this function could probably use some more cleanup, but i'll save that for another rainy day. functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions b/functions index e54f4bf..4f231b1 100644 --- a/functions +++ b/functions @@ -413,11 +413,12 @@ add_full_dir() { local f= if [[ -n $1 && -d $1 ]]; then + add_dir "$1" + for f in "$1"/*; do if [[ -L $f ]]; then add_symlink "$f" "$(readlink "$f")" elif [[ -d $f ]]; then - add_dir "$f" add_full_dir "$f" elif [[ -f $f ]]; then add_file "$f" -- 1.8.4

1 1

[arch-projects] [pyalpm][PATCH] Strip comments that aren't at the start from pycman.config
by Frostyfrog 19 Sep '13

19 Sep '13

diff -aur pyalpm-0.6.2/pycman/config.py mychanges/pycman/config.py --- pyalpm-0.6.2/pycman/config.py 2013-08-04 13:20:24.000000000 -0600 +++ mychanges/pycman/config.py 2013-09-17 23:07:57.895283250 -0600 @@ -94,6 +94,8 @@ filestack.pop() continue + if line.find(' #') > 0: + line=line[:line.find(' #')].strip() line = line.strip() if len(line) == 0: continue if line[0] == '#':

3 2

[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