- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] Add an option to explicitly run namcap
by Jan Steffens 18 Sep '11

18 Sep '11

Installs namcap if needed, *after* building the package, contrary to the former way of having to have namcap installed, e.g. via makedepends. Signed-off-by: Jan Steffens <jan.steffens(a)gmail.com> --- makechrootpkg | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index a60c9fe..974628c 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -18,6 +18,7 @@ update_first='0' clean_first='0' install_pkg='' add_to_db=0 +run_namcap=0 chrootdir='' @@ -54,11 +55,12 @@ usage() { echo '-I <pkg> Install a package into the working copy of the chroot' echo '-l <copy> The directory to use as the working copy of the chroot' echo ' Useful for maintaining multiple copies.' + echo '-n Run namcap on the package' echo " Default: $default_copy" exit 1 } -while getopts 'hcudr:I:l:' arg; do +while getopts 'hcudr:I:l:n' arg; do case "${arg}" in h) usage ;; c) clean_first=1 ;; @@ -67,6 +69,7 @@ while getopts 'hcudr:I:l:' arg; do r) chrootdir="$OPTARG" ;; I) install_pkg="$OPTARG" ;; l) copy="$OPTARG" ;; + n) run_namcap=1 ;; *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;; esac done @@ -175,6 +178,8 @@ if [ "$REPACK" != "1" ]; then rm -rf "$copydir/build/"* fi +[ "$run_namcap" -eq "1" ] && touch "$copydir/build/RUN_NAMCAP" + # Read .makepkg.conf even if called via sudo if [ -n "${SUDO_USER}" ]; then makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf" @@ -257,7 +262,10 @@ cd /build export HOME=/build sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED [ -f BUILD_FAILED ] && exit 1 -which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log +if [ -f RUN_NAMCAP ]; then + pacman -S --needed --noconfirm namcap + namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log +fi exit 0 EOF ) > "$copydir/chrootbuild" @@ -303,3 +311,5 @@ if [ -e "${copydir}/build/BUILD_FAILED" ]; then rm "${copydir}/build/BUILD_FAILED" exit 1 fi + +# vim:set noet ts=8 sw=8: -- 1.7.6.1

2 4

[arch-projects] [MKINITCPIO][PATCH 1/2] Fix save build directory with presets
by Sebastien Luttringer 16 Sep '11

16 Sep '11

Current behaviour of -s option of mkinitcpio is bad when presets are used. mkinitcpio saves main process build directory which is always empty when preset option is used. mkinitcpio doesn't save preset sub processes build directories which is the expected behaviour. This patch fix the two previous points by: - inherit -s parameter inside preset sub processes. - force main process (in case of preset) to clean build directory Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- mkinitcpio | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 49dabbd..53254d7 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -64,7 +64,7 @@ cleanup () { if [[ $TMPDIR ]]; then if (( $SAVELIST )); then - msg "build directory saved in %s" "$TMPDIR" + msg "Build directory saved in %s" "$TMPDIR" else rm -rf "$TMPDIR" fi @@ -198,6 +198,7 @@ if [[ $PRESET ]]; then # Use -b, -m and -v options specified earlier declare -a preset_mkopts preset_cmd [[ $BASEDIR ]] && preset_mkopts+=(-b "$BASEDIR") + (( SAVELIST )) && preset_mkopts+=(-s) (( QUIET )) || preset_mkopts+=(-v) # Build all images . "$PRESET" @@ -237,7 +238,8 @@ if [[ $PRESET ]]; then msg2 "${preset_cmd[*]}" "$0" "${preset_cmd[@]}" done - cleanup 0 + # Main process never need to keep builded directory + SAVELIST=0 cleanup 0 else die "Preset not found: \`%s'" "$PRESET" fi -- Sebastien "Seblu" Luttringer

5 9

[arch-projects] [MKINITCPIO][PATCH 1/2] Fix save build directory with presets
by Sebastien Luttringer 16 Sep '11

16 Sep '11

Current behaviour of -s option of mkinitcpio is bad when presets are used. mkinitcpio saves main process build directory which is always empty when preset option is used. mkinitcpio doesn't save preset sub processes build directories which is the expected behaviour. This patch fix the two previous points by: - inherit -s parameter inside preset sub processes. - force main process (in case of preset) to clean build directory Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- mkinitcpio | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 49dabbd..f48a26d 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -64,7 +64,7 @@ cleanup () { if [[ $TMPDIR ]]; then if (( $SAVELIST )); then - msg "build directory saved in %s" "$TMPDIR" + msg "Build directory saved in %s" "$TMPDIR" else rm -rf "$TMPDIR" fi @@ -198,6 +198,7 @@ if [[ $PRESET ]]; then # Use -b, -m and -v options specified earlier declare -a preset_mkopts preset_cmd [[ $BASEDIR ]] && preset_mkopts+=(-b "$BASEDIR") + (( SAVELIST )) && preset_mkopts+=(-s) (( QUIET )) || preset_mkopts+=(-v) # Build all images . "$PRESET" @@ -237,7 +238,8 @@ if [[ $PRESET ]]; then msg2 "${preset_cmd[*]}" "$0" "${preset_cmd[@]}" done - cleanup 0 + # Main process never needs to keep build directory + SAVELIST=0 cleanup 0 else die "Preset not found: \`%s'" "$PRESET" fi -- Sebastien "Seblu" Luttringer

1 1

[arch-projects] [PATCH namcap 1/2] Remove PkgdirRule
by Dan McGee 16 Sep '11

16 Sep '11

It is now unused, and caused confusion regarding the sandbox directory stuff. Ideally it should never need to be used again, as all rules should operate directly on the tarball. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Namcap/ruleclass.py | 5 ----- README | 1 - namcap.py | 14 -------------- 3 files changed, 0 insertions(+), 20 deletions(-) diff --git a/Namcap/ruleclass.py b/Namcap/ruleclass.py index f34c657..15250ad 100644 --- a/Namcap/ruleclass.py +++ b/Namcap/ruleclass.py @@ -44,9 +44,4 @@ class TarballRule(AbstractRule): "The parent class of rules that process tarballs" pass -class PkgdirRule(AbstractRule): - """The parent class of rules that process pkgdirs - (extracted tarballs)""" - pass - # vim: set ts=4 sw=4 noet: diff --git a/README b/README index b52ea42..89f6fb5 100644 --- a/README +++ b/README @@ -84,7 +84,6 @@ defined in Namcap.rules.all_rules : * PkgInfoRule classes process any pkginfo object * PkgbuildRule classes process only PKGBUILDs * TarballRule classes process binary packages - * PkgdirRule classes (unused) process uncompressed binary packages Put the new rule in a module and make sure it is imported in Namcap/rules/__init__.py diff --git a/namcap.py b/namcap.py index dcebc55..cca5dd6 100755 --- a/namcap.py +++ b/namcap.py @@ -32,8 +32,6 @@ import types import Namcap.depends import Namcap.tags -sandbox_directory = '/tmp/namcap.' + str(os.getpid()) - # Functions def get_modules(): """Return all possible modules (rules)""" @@ -97,14 +95,6 @@ def process_realpackage(package, modules): if isinstance(rule, Namcap.ruleclass.PkgInfoRule): rule.analyze(pkginfo, None) - elif isinstance(rule, Namcap.ruleclass.PkgdirRule): - # If it's not extracted, extract it and then analyze the package - if not extracted: - os.mkdir(sandbox_directory) - for j in pkgtar.getmembers(): - pkgtar.extract(j, sandbox_directory) - extracted = 1 - rule = pkg.analyze(pkginfo, sandbox_directory) elif isinstance(rule, Namcap.ruleclass.PkgbuildRule): pass elif isinstance(rule, Namcap.ruleclass.TarballRule): @@ -126,10 +116,6 @@ def process_realpackage(package, modules): if info_reporting: show_messages(pkginfo["name"], 'I', infos) - # Clean up if we extracted anything - if extracted: - shutil.rmtree(sandbox_directory) - def process_pkginfo(pkginfo, modules): """Runs namcap checks of a single, non-split PacmanPackage object""" for i in modules: -- 1.7.6.1

2 2

[arch-projects] [MKINITCPIO][PATCH] Fix save build directory with presets
by Sebastien Luttringer 13 Sep '11

13 Sep '11

Current behaviour of -s option of mkinitcpio is bad when presets are used. mkinitcpio saves main process build directory which is always empty when preset option is used. mkinitcpio doesn't save preset sub processes build directories which is the expected behaviour. This patch fix the two previous points by: - inherit -s parameter inside preset sub processes. - force main process (in case of preset) to clean build directory Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- mkinitcpio | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 49dabbd..53254d7 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -64,7 +64,7 @@ cleanup () { if [[ $TMPDIR ]]; then if (( $SAVELIST )); then - msg "build directory saved in %s" "$TMPDIR" + msg "Build directory saved in %s" "$TMPDIR" else rm -rf "$TMPDIR" fi @@ -198,6 +198,7 @@ if [[ $PRESET ]]; then # Use -b, -m and -v options specified earlier declare -a preset_mkopts preset_cmd [[ $BASEDIR ]] && preset_mkopts+=(-b "$BASEDIR") + (( SAVELIST )) && preset_mkopts+=(-s) (( QUIET )) || preset_mkopts+=(-v) # Build all images . "$PRESET" @@ -237,7 +238,8 @@ if [[ $PRESET ]]; then msg2 "${preset_cmd[*]}" "$0" "${preset_cmd[@]}" done - cleanup 0 + # Main process never need to keep builded directory + SAVELIST=0 cleanup 0 else die "Preset not found: \`%s'" "$PRESET" fi -- Sebastien "Seblu" Luttringer

1 0

[arch-projects] [MKINITCPIO][PATCH] Add a virtio hook
by Sebastien Luttringer 12 Sep '11

12 Sep '11

This allow initcpio to boot vm which use virtio as network/disk backend. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- install/virtio | 14 ++++++++++++++ mkinitcpio.conf | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) create mode 100644 install/virtio diff --git a/install/virtio b/install/virtio new file mode 100644 index 0000000..b2974a5 --- /dev/null +++ b/install/virtio @@ -0,0 +1,14 @@ +build() { + MODULES+=" $(checked_modules 'virtio')" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for virtio devices. + Detection will take place at runtime. To minimize the modules + in the image, add the autodetect hook too. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/mkinitcpio.conf b/mkinitcpio.conf index d53aabe..ed60682 100644 --- a/mkinitcpio.conf +++ b/mkinitcpio.conf @@ -54,7 +54,7 @@ FILES="" # ## This setup loads an lvm2 volume group on a usb device. # HOOKS="base udev usb lvm2 filesystems" -HOOKS="base udev autodetect pata scsi sata filesystems usbinput" +HOOKS="base udev autodetect pata scsi sata virtio filesystems usbinput" # COMPRESSION # Use this to compress the initramfs image. With kernels earlier than -- Sebastien "Seblu" Luttringer

1 0

[arch-projects] [PATCH] archrelease: call 'svn copy' once for all files
by Dan McGee 09 Sep '11

09 Sep '11

We don't need to invoke svn copy on each file; it accepts multiple arguments. This cut Allan's time releasing one patch-friendly package from 5 minutes to 2 minutes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- archrelease | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/archrelease b/archrelease index 2f6a563..7bb4c8a 100755 --- a/archrelease +++ b/archrelease @@ -52,9 +52,8 @@ for tag in "$@"; do svn add --parents -q "repos/$tag" fi - for file in "${known_files[@]}"; do - svn copy -q -r HEAD "$trunk/$file" "repos/$tag/" - done + # copy all files at once from trunk to the subdirectory in repos/ + svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/" echo 'done' done -- 1.7.6.1

4 7

[arch-projects] [PATCH] [mkinitcpio] Add missing groups=('base') in PKGBUILD
by Gerardo Exequiel Pozzi 07 Sep '11

07 Sep '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- PKGBUILD | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2cb6a6d..3352378 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,6 +7,7 @@ pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" license=('GPL') +groups=('base') conflicts=('mkinitcpio') provides=("mkinitcpio=$pkgver") depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' -- 1.7.6.1

3 4

[arch-projects] [devtools] [PATCH 1/2] Support non-standard install locations
by Lukas Fleischer 05 Sep '11

05 Sep '11

This build system overhaul allows for adding (define-style) macros to our scripts. All source files are now suffixed with ".in" to clarify that they might contain unprocessed defines. The Makefile provides a new rule to preprocess source files and generate proper output scripts. Also, add a "@pkgdatadir@" define (as used in GNU Autotools) and use it instead of hardcoded paths to "/usr/share/devtools" everywhere. We missed this when adding PREFIX support to the build system in commit 35fc83ce7d8dc26cd424321f2e8638d05da0a6d4. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- .gitignore | 12 ++++++++++++ Makefile | 8 +++++++- archbuild => archbuild.in | 4 ++-- archco => archco.in | 0 archrelease => archrelease.in | 0 archrm => archrm.in | 0 bash_completion => bash_completion.in | 0 checkpkg => checkpkg.in | 0 commitpkg => commitpkg.in | 0 finddeps => finddeps.in | 0 lddd => lddd.in | 0 makechrootpkg => makechrootpkg.in | 0 mkarchroot => mkarchroot.in | 0 rebuildpkgs => rebuildpkgs.in | 0 zsh_completion => zsh_completion.in | 0 15 files changed, 21 insertions(+), 3 deletions(-) rename archbuild => archbuild.in (93%) mode change 100755 => 100644 rename archco => archco.in (100%) mode change 100755 => 100644 rename archrelease => archrelease.in (100%) mode change 100755 => 100644 rename archrm => archrm.in (100%) mode change 100755 => 100644 rename bash_completion => bash_completion.in (100%) rename checkpkg => checkpkg.in (100%) mode change 100755 => 100644 rename commitpkg => commitpkg.in (100%) mode change 100755 => 100644 rename finddeps => finddeps.in (100%) mode change 100755 => 100644 rename lddd => lddd.in (100%) mode change 100755 => 100644 rename makechrootpkg => makechrootpkg.in (100%) mode change 100755 => 100644 rename mkarchroot => mkarchroot.in (100%) mode change 100755 => 100644 rename rebuildpkgs => rebuildpkgs.in (100%) mode change 100755 => 100644 rename zsh_completion => zsh_completion.in (100%) diff --git a/.gitignore b/.gitignore index d823845..5649c00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,14 @@ *~ devtools-*.tar.gz +archbuild +archco +archrelease +archrm +bash_completion +commitpkg +finddeps +lddd +makechrootpkg +mkarchroot +rebuildpkgs +zsh_completion diff --git a/Makefile b/Makefile index 6f7a238..47378ff 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,13 @@ ARCHBUILD_LINKS = \ multilib-build \ multilib-testing-build -all: +all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion + +%: %.in + @echo "GEN $@" + @sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" "$<" >"$@" + @chmod a-w "$@" + @chmod +x "$@" install: install -dm0755 $(DESTDIR)$(PREFIX)/bin diff --git a/archbuild b/archbuild.in old mode 100755 new mode 100644 similarity index 93% rename from archbuild rename to archbuild.in index 5518996..92d2554 --- a/archbuild +++ b/archbuild.in @@ -54,8 +54,8 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" setarch "${arch}" mkarchroot \ - -C "/usr/share/devtools/pacman-${repo}.conf" \ - -M "/usr/share/devtools/makepkg-${arch}.conf" \ + -C "@pkgdatadir@/pacman-${repo}.conf" \ + -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" else diff --git a/archco b/archco.in old mode 100755 new mode 100644 similarity index 100% rename from archco rename to archco.in diff --git a/archrelease b/archrelease.in old mode 100755 new mode 100644 similarity index 100% rename from archrelease rename to archrelease.in diff --git a/archrm b/archrm.in old mode 100755 new mode 100644 similarity index 100% rename from archrm rename to archrm.in diff --git a/bash_completion b/bash_completion.in similarity index 100% rename from bash_completion rename to bash_completion.in diff --git a/checkpkg b/checkpkg.in old mode 100755 new mode 100644 similarity index 100% rename from checkpkg rename to checkpkg.in diff --git a/commitpkg b/commitpkg.in old mode 100755 new mode 100644 similarity index 100% rename from commitpkg rename to commitpkg.in diff --git a/finddeps b/finddeps.in old mode 100755 new mode 100644 similarity index 100% rename from finddeps rename to finddeps.in diff --git a/lddd b/lddd.in old mode 100755 new mode 100644 similarity index 100% rename from lddd rename to lddd.in diff --git a/makechrootpkg b/makechrootpkg.in old mode 100755 new mode 100644 similarity index 100% rename from makechrootpkg rename to makechrootpkg.in diff --git a/mkarchroot b/mkarchroot.in old mode 100755 new mode 100644 similarity index 100% rename from mkarchroot rename to mkarchroot.in diff --git a/rebuildpkgs b/rebuildpkgs.in old mode 100755 new mode 100644 similarity index 100% rename from rebuildpkgs rename to rebuildpkgs.in diff --git a/zsh_completion b/zsh_completion.in similarity index 100% rename from zsh_completion rename to zsh_completion.in -- 1.7.6.1

1 4

[arch-projects] [PATCH] ide: add deprecation warning
by Tom Gundersen 02 Sep '11

02 Sep '11

Current udev does not work well with the IDE subsystem, so we should encourage users to move to the ATA subsystem instead (using the pata hook). We should probably get rid of the IDE subsystem from the kernel altogether at some point (so people don't end up using it by accedint). Dan successfully debugged and fixed the only blocker that I'm aware of <https://bugzilla.kernel.org/show_bug.cgi?id=41582>, but there might of course be others. Signed-off-by: Tom Gundersen <teg(a)jklm.no> Cc: Dan McGee <dpmcgee(a)gmail.com> Cc: Thomas B�chler <thomas(a)archlinux.org> Cc: Tobias Powalowski <tpowa(a)archlinux.org> --- v2: add warning also on install, as suggested by Dan. Also make the messages more scary by using the err/error functions. hooks/ide | 5 +++++ install/ide | 7 +++++-- install/pata | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 hooks/ide diff --git a/hooks/ide b/hooks/ide new file mode 100644 index 0000000..bba036c --- /dev/null +++ b/hooks/ide @@ -0,0 +1,5 @@ +# vim: set ft=sh: +run_hook () +{ + err "The 'ide' hook is going away, use 'pata' instead." +} diff --git a/install/ide b/install/ide index fa0da51..29bb02f 100644 --- a/install/ide +++ b/install/ide @@ -2,6 +2,7 @@ build() { + error "The 'ide' hook is going away, please use 'pata' instead." MODULES=" $(checked_modules "/ide/" | grep -v "legacy") "; MODULES=$(echo ${MODULES}) #trim whitespace @@ -11,14 +12,16 @@ build() BINARIES="" FILES="" - SCRIPT="" + SCRIPT="ide" } help () { cat<<HELPEOF This hook loads the necessary modules for an ide root device, - using the old ide subsystem. + using the deprecated ide subsystem. This does not work well with + current userspace, and will be removed from the kernel in an upcoming + release. Please use the "pata" hook instead. Detection will take place at runtime. To minimize the modules in the image, add the autodetect hook too. HELPEOF diff --git a/install/pata b/install/pata index 75a75c1..603f01f 100644 --- a/install/pata +++ b/install/pata @@ -11,7 +11,7 @@ build() { help() { cat<<HELPEOF This hook loads the necessary modules for a pata (ide) root device, using the -new libata subsystem. Detection will take place at runtime. To minimize the +libata subsystem. Detection will take place at runtime. To minimize the modules in the image, add the autodetect hook too. HELPEOF } -- 1.7.6.1

1 0