- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [PATCH] makepkg: Move .PKGINFO creation into a function.
by Loui Chang 22 Jun '09

22 Jun '09

On Mon 22 Jun 2009 17:15 +1000, Allan McRae wrote: > Thanks pushed to my working branch with a couple of minor changes: > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 2140ff0..2bb7eb9 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -880,14 +880,13 @@ write_pkginfo() { > fi > local size=$(du -sk | awk '{print $1 * 1024}') > > - # write the .PKGINFO file > msg2 "$(gettext "Generating .PKGINFO file...")" > echo "# Generated by makepkg $myver" >.PKGINFO > if [ "$INFAKEROOT" -eq 1 ]; then > echo "# using $(fakeroot -v)" >>.PKGINFO > fi > echo "# $(LC_ALL=C date -u)" >>.PKGINFO > - echo "pkgname = $nameofpkg" >>.PKGINFO > + echo "pkgname = $1" >>.PKGINFO > echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO > echo "pkgdesc = $pkgdesc" >>.PKGINFO > echo "url = $url" >>.PKGINFO Cheers!

1 0

[pacman-dev] [PATCH] makepkg: Move .PKGINFO creation into a function.
by Loui Chang 22 Jun '09

22 Jun '09

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- scripts/makepkg.sh.in | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b555a03..2140ff0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,22 +871,7 @@ tidy_install() { fi } -create_package() { - if [ -z "$1" ]; then - nameofpkg="$pkgname" - else - nameofpkg="$1" - fi - - if [ ! -d "$pkgdir" ]; then - error "$(gettext "Missing pkg/ directory.")" - plain "$(gettext "Aborting...")" - exit 1 # $E_MISSING_PKGDIR - fi - - cd "$pkgdir" - msg "$(gettext "Creating package...")" - +write_pkginfo() { local builddate=$(date -u "+%s") if [ -n "$PACKAGER" ]; then local packager="$PACKAGER" @@ -958,6 +943,25 @@ create_package() { warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi +} + +create_package() { + if [ ! -d "$pkgdir" ]; then + error "$(gettext "Missing pkg/ directory.")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_PKGDIR + fi + + if [ -z "$1" ]; then + nameofpkg="$pkgname" + else + nameofpkg="$1" + fi + + write_pkginfo $nameofpkg + + cd "$pkgdir" + msg "$(gettext "Creating package...")" local comp_files=".PKGINFO" -- 1.6.3.2

2 1

Re: [pacman-dev] [PATCH 1/3] makepkg: Move .PKGINFO creation into a function.
by Loui Chang 22 Jun '09

22 Jun '09

On Sun 21 Jun 2009 20:49 +1000, Allan McRae wrote: > Loui Chang wrote: > >Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> > >--- > > scripts/makepkg.sh.in | 24 ++++++++++++++---------- > > 1 files changed, 14 insertions(+), 10 deletions(-) > > > > I'd like this to stay at the top of create_package as nameofpkg is > also needed there. Then write_pkginfo can just be called with > "write_pkginfo $nameofpkg" > > > if [ -z "$1" ]; then > > nameofpkg="$pkgname" > > else > > nameofpkg="$1" > > fi > > The warning about license should be moved to the write_pkginfo function. Alright another one is coming with those suggestions.

1 0

[pacman-dev] [PATCH] add pkgbase to package and database
by Pierre Schmitz 21 Jun '09

21 Jun '09

Hi, this simple addition makes it easy to implement split package support in our db-scripts. But it might be a quite useful information anyway and thus not Arch related. -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

2 5

Re: [pacman-dev] [PATCH 2/3] makepkg: Download sources and check checksums for any source package.
by Loui Chang 21 Jun '09

21 Jun '09

On Sun 21 Jun 2009 20:36 +1000, Allan McRae wrote: > @Loui: you should look into enabling commit hooks to avoid white > space issues. Whoops. Thanks for the notice.

1 0

[pacman-dev] [PATCH 1/3] makepkg: Move .PKGINFO creation into a function.
by Loui Chang 21 Jun '09

21 Jun '09

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- scripts/makepkg.sh.in | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 433fe34..d396480 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,22 +871,13 @@ tidy_install() { fi } -create_package() { +write_pkginfo() { if [ -z "$1" ]; then nameofpkg="$pkgname" else nameofpkg="$1" fi - if [ ! -d "$pkgdir" ]; then - error "$(gettext "Missing pkg/ directory.")" - plain "$(gettext "Aborting...")" - exit 1 # $E_MISSING_PKGDIR - fi - - cd "$pkgdir" - msg "$(gettext "Creating package...")" - local builddate=$(date -u "+%s") if [ -n "$PACKAGER" ]; then local packager="$PACKAGER" @@ -951,6 +942,19 @@ create_package() { fi fi done +} + +create_package() { + if [ ! -d "$pkgdir" ]; then + error "$(gettext "Missing pkg/ directory.")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_PKGDIR + fi + + write_pkginfo $@ + + cd "$pkgdir" + msg "$(gettext "Creating package...")" # TODO maybe remove this at some point # warn if license array is not present or empty -- 1.6.3.2

2 3

[pacman-dev] [PATCH] add makedepends to package and database
by Pierre Schmitz 17 Jun '09

17 Jun '09

Hi, I think it would be nice to have information about makedepnds available in each pacakge and the pacakge database. Think about rebuilds (statically linked) or the question if a certain package can be (re)moved. -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

4 20

[pacman-dev] [PATCH] Document the .pacnew extension with NoUpgrade
by Nagy Gabor 17 Jun '09

17 Jun '09

>From c62951e21bd61982be4bae2dc5bdbd0651ab53f9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 16 Jun 2009 12:34:16 +0200 Subject: [PATCH] Document the .pacnew extension with NoUpgrade See FS#13832. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.conf.5.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 2f1fe3d..a1c1f2a 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -113,7 +113,8 @@ Options *NoUpgrade =* file ...:: All files listed with a `NoUpgrade` directive will never be touched during - a package install/upgrade. + a package install/upgrade, and the new files will be installed with a + '.pacnew' extension. These files refer to files in the package archive, so do not include the leading slash (the RootDir) when specifying them. -- 1.6.0.3

1 0

[pacman-dev] [PATCH] repo-add: use bsdtar optimization for better performance
by Dan McGee 17 Jun '09

17 Jun '09

When unzipping packages and the database archives, we don't need to look through the entire archive to do what we need to do. For packages, .PKGINFO should only be found once and should be the first file in the package. For the database check, we only really need to look for one desc file. The bsdtar -q option is very similar to the GNU tar --occurrence=1 option. Example of speedup: $ time repo-add junkdb.db.tar.gz *.pkg.tar.gz >/dev/null real 0m16.159s user 0m14.836s sys 0m2.277s $ time ./scripts/repo-add junkdb.db.tar.gz *.pkg.tar.gz >/dev/null real 0m4.949s user 0m3.730s sys 0m2.093s Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7c12aaf..5454fb0 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -193,7 +193,7 @@ db_write_entry() # read info from the zipped package local line var val - for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | + for line in $(bsdtar -xOqf "$pkgfile" .PKGINFO | grep -v '^#' | sed 's|$\w*$\s*=\s*$.*$|\1 \2|'); do # bash awesomeness here- var is always one word, val is everything else var=${line%% *} @@ -305,7 +305,7 @@ check_repo_db() fi if [ -f "$REPO_DB_FILE" ]; then - if ! (bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"); then + if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' 2>&1 >/dev/null; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi @@ -351,7 +351,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then + if ! bsdtar -tqf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi -- 1.6.3.2

3 2

[pacman-dev] wanted: script to list uninstalled optdepends and packages that need them
by Allan McRae 16 Jun '09

16 Jun '09

Hi all, I had a thought today that a script to list package that are optdepends but not installed could be quite useful... I have not written one, but thought it would be good for pacman-contrib if someone wanted to contribute. Example output: tk - optional for: ruby - for Ruby/TK python - for IDLE, pynche and modulator fakeroot - optional for: pacman - for makepkg usage as normal user So get script writing! Preferably in bash or perl (which the current scripts use). Allan

6 15