- Pacman-dev - lists.archlinux.org

[pacman-dev] Order of option parsing and sourcing makepkg.conf
by Allan McRae 14 Dec '08

14 Dec '08

Hi, With the commit which enables us to specify the makepkg config file on the command-line (http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=4b183bf9) the sourcing of the config file gets moved after the parsing of the options. This creates problems with the --help flag as it needs to know what BUILDSCRIPT is defined as. It also causes problems when specifying a different BUILDSCRIPT with -p as this gets set during option parsing then gets overwritten with the makepkg config file gets sourced. I don't see a nice fix for this. Sourcing the conf file before option parsing and then again after if it is changed seems not good to me. So can we back that patch out at least temporarily. Note that this does not effect maint so the 3.2.2 release will be bug free as usual. Allan

3 6

Re: [pacman-dev] makepkg: package splitting
by Miklos Vajna 10 Dec '08

10 Dec '08

On Mon, Dec 08, 2008 at 12:35:41PM +1000, Allan McRae <allan(a)archlinux.org> wrote: > pkgname=('abs-core' 'abs-readme') > pkgver=2.3 > pkgrel=1 > arch=('i686' 'x86_64') > url="http://projects.archlinux.org/git/?p=abs.git" > license=('GPL') > source=(ftp://ftp.archlinux.org/other/abs/abs-${pkgver}.tar.gz) > md5sums=('d6fd791aa487ba8bb5ff48c3ace20592') > > build() { > cd ${srcdir}/abs > make CONFDIR=/etc/ || return 1 > > # change ABS tags for x86_64 to correct values > if [ "$CARCH" = "x86_64" ]; then > sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf > fi > } > > package_abs-core() { > pkgdesc="Utilities to download and work with the Arch Build System (ABS)" > depends=('bash' 'rsync') > backup=(etc/abs.conf) > > cd ${srcdir}/abs > make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1 > } > > package_abs-readme() { > pkgdesc="ABS base directory and README file" > depends=('abs') > install=abs.install > > # Add readme file, and make base /var/abs path > install -dm0755 ${pkgdir}/var/abs/local/ > install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README > } How does this allow one to define package-dependent dependencies? Typically foo-python will have to depend on python, but foo won't. Thanks.

1 1

[pacman-dev] pacman summary!
by smurfd 10 Dec '08

10 Dec '08

Hi, i have a suggestion, like the suggestion i gave to the portage developers for the gentoo "package" manager. It would be really nice, if after a "pacman -Suy" or just a simple "pacman -S <packagelist>" that you got a summary of all the messages that has been spit out on the screen while doing the upgrade of packages. If you upgrade several packages, say 100 of them or so, it could be hard to read all the notices that every package spits out when beeing installed. i mean stuff like : *>>> Updating module dependencies. Please wait ... >>> MKINITCPIO SETUP >>> ---------------- >>> If you use LVM2, Encrypted root or software RAID, >>> Ensure you enable support in /etc/mkinitcpio.conf . >>> More information about mkinitcpio setup can be found here: >>> http://wiki.archlinux.org/index.php/Mkinitcpio >>> Generating initial ramdisk, using mkinitcpio. Please wait... * Hope you like the idea, and i dont think it should be so hard to apply. cut all of the >>> things to a temp file and after doing the last upgrade you cat whatever is in that temp file.. or something like that. Best regards /smurfd

2 2

[pacman-dev] makepkg: package splitting
by Allan McRae 09 Dec '08

09 Dec '08

I have finished implementing the basics of package splitting in makepkg. Everything works as expected when just making packages and capturing logs but there is some small output issues that need tidying up and checking that other functionality work (e.g. repackaging is an issue....) Anyway you can see the work on my "splitpkg" branch: http://dev.archlinux.org/~allan/gitweb/gitweb.cgi?p=pacman.git;a=shortlog;h… For your interest, I have attached the same package written in three different ways to show you what makepkg can now do: PKGBUILD.1 - Traditional build PKGBUILD.2 - Splitting the packaging step from build step. Limits fakeroot usage PKGBUILD.3 - Package splitting # $Id: PKGBUILD 366 2008-04-19 13:01:23Z travis $ # Maintainer: Allan McRae <allan(a)archlinux.org> pkgname=abs pkgver=2.3 pkgrel=1 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64') url="http://projects.archlinux.org/git/?p=abs.git" license=('GPL') depends=('bash' 'rsync') backup=(etc/abs.conf) install=abs.install source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz) md5sums=('d6fd791aa487ba8bb5ff48c3ace20592') build() { cd ${srcdir}/${pkgname} make CONFDIR=/etc/ || return 1 make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1 # Add readme file, and make base /var/abs path install -dm0755 ${pkgdir}/var/abs/local/ install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README # change ABS tags for x86_64 to correct values if [ "$CARCH" = "x86_64" ]; then sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf fi } # vim: set ts=2 sw=2 noet: # $Id: PKGBUILD 366 2008-04-19 13:01:23Z travis $ # Maintainer: Allan McRae <allan(a)archlinux.org> pkgname=abs pkgver=2.3 pkgrel=1 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64') url="http://projects.archlinux.org/git/?p=abs.git" license=('GPL') depends=('bash' 'rsync') backup=(etc/abs.conf) install=abs.install source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz) md5sums=('d6fd791aa487ba8bb5ff48c3ace20592') build() { cd ${srcdir}/${pkgname} make CONFDIR=/etc/ || return 1 # change ABS tags for x86_64 to correct values if [ "$CARCH" = "x86_64" ]; then sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf fi } package() { cd ${srcdir}/${pkgname} make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1 # Add readme file, and make base /var/abs path install -dm0755 ${pkgdir}/var/abs/local/ install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README } # vim: set ts=2 sw=2 noet: # $Id: PKGBUILD 366 2008-04-19 13:01:23Z travis $ # Maintainer: Allan McRae <allan(a)archlinux.org> pkgname=('abs-core' 'abs-readme') pkgver=2.3 pkgrel=1 arch=('i686' 'x86_64') url="http://projects.archlinux.org/git/?p=abs.git" license=('GPL') source=(ftp://ftp.archlinux.org/other/abs/abs-${pkgver}.tar.gz) md5sums=('d6fd791aa487ba8bb5ff48c3ace20592') build() { cd ${srcdir}/abs make CONFDIR=/etc/ || return 1 # change ABS tags for x86_64 to correct values if [ "$CARCH" = "x86_64" ]; then sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf fi } package_abs-core() { pkgdesc="Utilities to download and work with the Arch Build System (ABS)" depends=('bash' 'rsync') backup=(etc/abs.conf) cd ${srcdir}/abs make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1 } package_abs-readme() { pkgdesc="ABS base directory and README file" depends=('abs') install=abs.install # Add readme file, and make base /var/abs path install -dm0755 ${pkgdir}/var/abs/local/ install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README } # vim: set ts=2 sw=2 noet:

2 3

Re: [pacman-dev] makepkg: package splitting
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 09 Dec '08

09 Dec '08

Am Dienstag, den 09.12.2008, 21:57 +1000 schrieb Allan McRae: > Marc - A. Dahlhaus [ Administration | Westermann GmbH ] wrote: > > Am Montag, den 08.12.2008, 12:35 +1000 schrieb Allan McRae: > > > >> I have finished implementing the basics of package splitting in > >> makepkg. Everything works as expected when just making packages and > >> capturing logs but there is some small output issues that need tidying > >> up and checking that other functionality work (e.g. repackaging is an > >> issue....) > >> > > > > Hello Allan, > > > > > > i've tested the script and found some bugs: > > > > The sourcing of makepkg.conf is in a wrong location (far to late). > > If you display the usage via --help you get no PKGBUILD mentioned in > > usages output. If you specify another buildscript via -p you get that > > mentioned in usage but it gets overwritten by the contents of > > makepkg.conf when it gets sourced in later before the actual build is > > done. > > > > Good catch.... I have no idea what caused that! Should not be herd to > track down though. > > > If you give -c to makepkg the pkgdirs of the splitpackages don't get > > erased. > > > > Someone is either running makepkg as root or without fakeroot... > Anyway, thats an easy fix. I'll tested that again and i forgot to change two of the DESTDIR locations to the new home of the pkgdirs... So the missing cleanup was actually a stupid user error... > > But the actual build and logging went fine, thank you :) > > > > Good to see the bits I tested actually working! Thanks for your help. > > Allan

2 1

Re: [pacman-dev] makepkg: package splitting
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 09 Dec '08

09 Dec '08

Am Montag, den 08.12.2008, 12:35 +1000 schrieb Allan McRae: > I have finished implementing the basics of package splitting in > makepkg. Everything works as expected when just making packages and > capturing logs but there is some small output issues that need tidying > up and checking that other functionality work (e.g. repackaging is an > issue....) Hello Allan, i've tested the script and found some bugs: The sourcing of makepkg.conf is in a wrong location (far to late). If you display the usage via --help you get no PKGBUILD mentioned in usages output. If you specify another buildscript via -p you get that mentioned in usage but it gets overwritten by the contents of makepkg.conf when it gets sourced in later before the actual build is done. If you give -c to makepkg the pkgdirs of the splitpackages don't get erased. But the actual build and logging went fine, thank you :) Hope that helps, Marc

2 2

[pacman-dev] pacman 3.2.2 release
by Dan McGee 08 Dec '08

08 Dec '08

I'd like to do a 3.2.2 release sometime soon (this week, more than likely). Let me know if there are any outstanding patches for this release that aren't already in the maint branch as of tonight. I will put a call for updated translations out in the coming few days. -Dan

2 1

[pacman-dev] [translation] small fix for Russian translation
by serg 08 Dec '08

08 Dec '08

pacman/po/ru.po 972c972 < msgstr "ОШИбКА:" --- > msgstr "ОШИБКА:"

1 0

[pacman-dev] [PATCH] makepkg: Introduce restrict option
by Allan McRae 08 Dec '08

08 Dec '08

The restrict option, combined with the RESTRICTED_FILES variable, allows makepkg to automatically remove common confliting files (e.g. /usr/share/info/dir). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 8 ++++++++ etc/makepkg.conf.in | 7 +++++-- scripts/makepkg.sh.in | 8 ++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 18dbf35..84e8192 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -125,6 +125,9 @@ Options *zipman*;; Compress manual (man and info) pages with gzip. + *restrict*;; + Remove restricted files from the package. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: @@ -150,6 +153,11 @@ Options to this array. *NOTE:* Do not add the leading slash to the directory name. +**RESTRICTED_FILES=(**usr/{,share}/info/dir ...**)**:: + If "restrict" is specified in the OPTIONS array, this variable will + instruct makepkg which files to remove from the package. This is + useful for index files that are added to by multiple packages. + **PKGDEST=**"/path/to/folder":: If this value is not set, packages will by default be placed in the current directory (location of the linkman:PKGBUILD[5]). Many people diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 82722be..545a215 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -58,7 +58,7 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip !docs libtool emptydirs zipman) +# Default: OPTIONS=(strip !docs libtool emptydirs zipman restrict) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -66,8 +66,9 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages with gzip +#-- restrict: Remove files sepecified below from package # -OPTIONS=(strip !docs libtool emptydirs zipman) +OPTIONS=(strip !docs libtool emptydirs zipman restrict) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -77,6 +78,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) +#-- Files to be removed from all packages +RESTRICTED_FILES=(usr/{,share}/info/dir) ######################################################################### # PACKAGE OUTPUT diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bf6524d..ea27883 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -41,7 +41,7 @@ confdir='@sysconfdir@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'restrict') other_options=('ccache' 'distcc' 'makeflags' 'force') readonly -a packaging_options other_options @@ -792,7 +792,6 @@ tidy_install() { done fi - if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" local binary @@ -818,6 +817,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if [ "$(check_option restrict)" = "y" -a -n "RESTRICTED_FILES" ]; then + msg2 "$(gettext "Removing restricted files...")" + rm -f ${RESTRICTED_FILES[@]} + fi + if [ "$(check_option emptydirs)" = "n" ]; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete -- 1.6.0.4

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-59-gbd62827
by dan＠archlinux.org 08 Dec '08

08 Dec '08

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 pacman repository". The branch, master has been updated via bd628274cc8db81704860e69894fcd217c2068d0 (commit) via 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d (commit) via 818fae320f22ea758765a55b3a3a98e2f0a66a45 (commit) via 69be73f68cc770ddcbe388af96e32f8bba7886f7 (commit) via 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (commit) via 59776ef306935399b2bf1e9cbdd7a7bfa6df1b49 (commit) via b373b1d16b6235bef2e34a9a21e043418222a813 (commit) from 61c6552862345cb155903cd1566f1cef5c527a94 (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 bd628274cc8db81704860e69894fcd217c2068d0 Merge: 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 7 22:12:17 2008 -0600 Merge branch 'maint' commit 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Thu Dec 4 21:03:31 2008 -0600 Update Italian translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 818fae320f22ea758765a55b3a3a98e2f0a66a45 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 6 23:32:34 2008 -0600 makepkg: ensure PKGBUILD does not contain CRLF characters Do a simple check before sourcing the file to ensure we are a valid bash script. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69be73f68cc770ddcbe388af96e32f8bba7886f7 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 14 03:08:52 2008 +1000 makepkg: several small bits of tidying 1. Do not warn people about missing arch if they are using --ignorearch. 2. Remove unneed reference to bug report about using fakeroot as little as possible. We want to do that, bug report of not. 3. Removes superfluous warning given when building as root. The user has already used the "--asroot" flag. 4. Move comment about skipping warning message to above where it occurs 5. Do not warn about skipping source retreval, integrety checks and extraction when using --repackage 6. Do not warn about skipping build when using --repackage 7. Move comment about fakeroot usage to above test condition Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pactree | 3 +- doc/PKGBUILD.5.txt | 2 +- doc/repo-add.8.txt | 4 +- po/it.po | 141 +++++++++++++++++++++++-------------------------- scripts/makepkg.sh.in | 41 +++++++-------- 5 files changed, 90 insertions(+), 101 deletions(-) hooks/post-receive -- The official pacman repository

1 0