From ab562bcecced5ef6f612495ffcd870a01e8a7f73 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 6 May 2009 16:32:42 -0500 Subject: cache-packs: Add missing packages to cache_packs. This should allow an install to take place completely from the local cd without needing to download from linhes.org --- .../larch/profiles/i686-testing-REMOTE/cache_packs | 34 ++++++++++++++++++++++ .../profiles/i686-testing-local-httpd/cache_packs | 34 ++++++++++++++++++++++ .../larch/profiles/i686-testing-local/cache_packs | 34 ++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs index ee4f3d1..a0cd53e 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs @@ -17,3 +17,37 @@ mythvodka oss xscreensaver tightvnc +#added from error log +mysql +mythnews +pycairo +pygobject +python-numeric +pygtk +fam +sqlite3 +xe +romdb +gconf +gnome-keyring +gnome-mime-data +gnome-python +gnome-python-extras +gnome-vfs +hunspell +libbonobo +libbonoboui +libgnome +libgnomecanvas +libgnomeui +libidl2 +miro +mozilla-common +nspr +nss +orbit2 +policykit +pyorbit +pyrex +startup-notification +xulrunner diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs index ee4f3d1..a0cd53e 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs @@ -17,3 +17,37 @@ mythvodka oss xscreensaver tightvnc +#added from error log +mysql +mythnews +pycairo +pygobject +python-numeric +pygtk +fam +sqlite3 +xe +romdb +gconf +gnome-keyring +gnome-mime-data +gnome-python +gnome-python-extras +gnome-vfs +hunspell +libbonobo +libbonoboui +libgnome +libgnomecanvas +libgnomeui +libidl2 +miro +mozilla-common +nspr +nss +orbit2 +policykit +pyorbit +pyrex +startup-notification +xulrunner diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs index ee4f3d1..a0cd53e 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs @@ -17,3 +17,37 @@ mythvodka oss xscreensaver tightvnc +#added from error log +mysql +mythnews +pycairo +pygobject +python-numeric +pygtk +fam +sqlite3 +xe +romdb +gconf +gnome-keyring +gnome-mime-data +gnome-python +gnome-python-extras +gnome-vfs +hunspell +libbonobo +libbonoboui +libgnome +libgnomecanvas +libgnomeui +libidl2 +miro +mozilla-common +nspr +nss +orbit2 +policykit +pyorbit +pyrex +startup-notification +xulrunner -- cgit v0.12 From aa4a7b5724ae99ca7a7ab9855bce12c308715129 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 6 May 2009 17:35:23 -0500 Subject: cache-packs: missed mythmovies from the list. --- build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs | 1 + build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs | 1 + build_tools/clarch/larch/profiles/i686-testing-local/cache_packs | 1 + 3 files changed, 3 insertions(+) diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs index a0cd53e..a121a8d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs @@ -51,3 +51,4 @@ pyorbit pyrex startup-notification xulrunner +mythmovies diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs index a0cd53e..a121a8d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs @@ -51,3 +51,4 @@ pyorbit pyrex startup-notification xulrunner +mythmovies diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs index a0cd53e..a121a8d 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs @@ -51,3 +51,4 @@ pyorbit pyrex startup-notification xulrunner +mythmovies -- cgit v0.12 From 4c8a2b26b0034e96fdc1ef47904ce00fa9792b06 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 8 May 2009 15:50:32 -0500 Subject: mp: add duplicate checking & autobump. If a duplicate pkg is detected the script will inform you and exit. -f may be used to force the creation of the pkg even if it's duplicate. Autobump: -b will increment the pkgver number by one. --- build_tools/bin/mp | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/build_tools/bin/mp b/build_tools/bin/mp index 884fece..5ff295d 100755 --- a/build_tools/bin/mp +++ b/build_tools/bin/mp @@ -10,6 +10,7 @@ SRCPKGHOME=/data/pkg_repo/src_packages mydir=`pwd` TOTALPKG="$pkgname"-"$pkgver"-"$pkgrel"-"$CARCH".pkg.tar.gz SRCPKG="$pkgname"-"$pkgver"-"$pkgrel".src.tar.gz +repolist="core extra" if [ x`basename $0` = xmpr ] then @@ -57,8 +58,6 @@ function find_repo { function update-repo { - - cd $DOCROOT echo echo "DOCROOT=$DOCROOT" @@ -92,11 +91,35 @@ function update-src-pkg { cp -f $PKGHOME/$SRCPKG $SRCPKGHOME/$REPO } +function dup_check { + if [ $REPO = "local" -o $REPO = "mv-core" ] + then + return + fi + + for i in $repolist + do + if [ ! $i$PFIX = $REPO ] + then + out=`pacman -Sl $i$PFIX|grep $pkgname` + if [ $? = 0 ] + then + echo "#######################################" + echo "$pkgname already exists in $i$PFIX" + echo " "$out + echo + echo "#######################################" + exit 2 + fi + fi + done + +} #MAIN PROGRAM find_repo - +dup_check makepkg --asroot $@ || exit 1 echo "---------updating database ----------" update-repo #&& pacman -Sy -- cgit v0.12 From 703b80388faaab775c94f935017c33e45bc46c25 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 8 May 2009 16:03:22 -0500 Subject: mp : bug fix for pkgrel when using -b. Needed to resource the PKGBUILD after bumping it --- build_tools/bin/mp | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/build_tools/bin/mp b/build_tools/bin/mp index 5ff295d..151980c 100755 --- a/build_tools/bin/mp +++ b/build_tools/bin/mp @@ -8,10 +8,8 @@ PKGHOME=/data/pkg_repo/packages SRCPKGHOME=/data/pkg_repo/src_packages mydir=`pwd` -TOTALPKG="$pkgname"-"$pkgver"-"$pkgrel"-"$CARCH".pkg.tar.gz -SRCPKG="$pkgname"-"$pkgver"-"$pkgrel".src.tar.gz repolist="core extra" - +cmdline=$@ if [ x`basename $0` = xmpr ] then PFIX="" @@ -19,6 +17,30 @@ else PFIX="-testing" fi +function bump { + echo x$cmdline | grep -q \\-b + if [ $? = 0 ] + then + cmdline=`echo $cmdline|sed -e "s/-b//g"` + i="PKGBUILD" + #getting pkgrel number after = + package_pkgrel=`cat $i | grep pkgrel= | cut -d'=' -f 2` + + #extract number before dot in pkgrel + beforedot=`echo $package_pkgrel | cut -n -d'.' -f 1` + + #add 1 to pkgrel + new_pkgrel=$[$beforedot+1] + + #write it back to PKGBUILD + sed -i "s:pkgrel=${package_pkgrel}:pkgrel=${new_pkgrel}:g" $i + echo "bumped $pkgname release from $package_pkgrel to $new_pkgrel" + . PKGBUILD + fi + TOTALPKG="$pkgname"-"$pkgver"-"$pkgrel"-"$CARCH".pkg.tar.gz + SRCPKG="$pkgname"-"$pkgver"-"$pkgrel".src.tar.gz + +} @@ -66,7 +88,7 @@ function update-repo { DELPKG="$pkgname"-"$pkgver"-*-"$CARCH".pkg.tar.gz #echo $DOCROOT #echo $DELPKG - echo "Removing old packages from:" + echo "Removing old packages from $CARCH/$REPO:" rm -fvI $DELPKG #copy in new package echo @@ -92,6 +114,7 @@ function update-src-pkg { } function dup_check { + if [ $REPO = "local" -o $REPO = "mv-core" ] then return @@ -108,8 +131,17 @@ function dup_check { echo "$pkgname already exists in $i$PFIX" echo " "$out echo - echo "#######################################" - exit 2 + + echo x$cmdline|grep -q \\-f + if [ $? = 0 ] + then + echo "Force detected, making pkg anyhow" + echo "#######################################" + return + else + echo "#######################################" + exit 2 + fi fi fi done @@ -120,7 +152,10 @@ function dup_check { find_repo dup_check -makepkg --asroot $@ || exit 1 +bump +echo "---------------" + +makepkg --asroot $cmdline || exit 1 echo "---------updating database ----------" update-repo #&& pacman -Sy echo "----------creating source package---------" -- cgit v0.12