From 3505f337fcabdc51c1c165587ae77b70a0161614 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 7 Jun 2011 13:29:32 -0300 Subject: fullpkg still needs local releasing --- fullpkg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fullpkg b/fullpkg index 410584a..a668b45 100755 --- a/fullpkg +++ b/fullpkg @@ -242,6 +242,10 @@ function _pkg_build () { 0) plain "The build was succesful." source .INFO && [ -n $repo ] && { +# Release locally + mipsrelease *.pkg.tar.?z + +# Stage for releasing librestage $repo || { echo "unstaged:$(basename $PWD)" >> $build_dir/log } -- cgit v1.2.3-2-g168b From 6d20859e305d5998358ee61d93741600fafd0b4e Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 7 Jun 2011 13:39:37 -0300 Subject: fullpkg needs to update the repo dbs after local release --- fullpkg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fullpkg b/fullpkg index a668b45..f281df3 100755 --- a/fullpkg +++ b/fullpkg @@ -249,6 +249,9 @@ function _pkg_build () { librestage $repo || { echo "unstaged:$(basename $PWD)" >> $build_dir/log } + + msg "Updating pacman db and packages" + sudo pacman -Syu --noconfirm } echo "built:$(basename $PWD)" >> $build_dir/log cleanup "$(basename $PWD)" -- cgit v1.2.3-2-g168b From 53f875ec295855c6170b61b06d792f8376b514a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 9 Jun 2011 16:37:38 -0300 Subject: pkgbuild-check-nonfree doesn't fail when the package shares the same name with the free replacement (ie. initscripts, pacman, etc.) --- pkgbuild-check-nonfree | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgbuild-check-nonfree b/pkgbuild-check-nonfree index f3fcd95..e947a39 100755 --- a/pkgbuild-check-nonfree +++ b/pkgbuild-check-nonfree @@ -59,17 +59,23 @@ source ./PKGBUILD # ./PKGBUILD. msg "Looking for unfree dependencies" for item in ${pkgname[@]} ${depends[@]} ${makedepends[@]} ; do - # We cycle through all of the programs in the array (if any), and check if - # they are in the `unfree' array. +# We cycle through all of the programs in the array (if any), and check if +# they are in the `unfree' array. if in_array $item ${unfree[@]} ; then - # if item has a free replacement, use error 16. - if in_array $item-libre ${freerep[@]} ; then - warning "$item -> $item-libre" - else - ev=15 +# If the package has a replacement of the same name, skip + if in_array $item ${freerep[@]} ; then + warning "$item is repackaged with the same name." + ev=0 + continue +# if item has a free replacement, use error 16. + elif in_array $item-libre ${freerep[@]} ; then + warning "$item -> $item-libre" + ev=16 + else + ev=15 msg2 "found $item" - fi + fi fi done -exit $ev \ No newline at end of file +exit $ev -- cgit v1.2.3-2-g168b From 1bbc75a678a69a27e18f09a9ab38d27545f013a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 9 Jun 2011 16:38:47 -0300 Subject: fixed typo --- libremakepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libremakepkg b/libremakepkg index b02b778..9a76f5f 100755 --- a/libremakepkg +++ b/libremakepkg @@ -60,7 +60,7 @@ while getopts ${libremakepkgargs} arg ; do esac done -if [ !-w / ]; then +if [ ! -w / ]; then error "This script must be run as root" exit 1 fi -- cgit v1.2.3-2-g168b