From 1c30298885f581f3bf3731576374da7044973747 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 11:42:07 -0800 Subject: Fix sourceball generation to work with conf file Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'misc-scripts/make-sourceball') diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 0006092..7a02abf 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -13,10 +13,7 @@ packagename="$1" reponame="$2" arch="$3" -##### Arch specific stuff. TODO make this configurable ##### -srcpath="/srv/ftp/sources/" -svnpath="file:///srv/svn-packages/$packagename/" -############################################################ +srcpath="$FTP_BASE/sources/" WORKDIR="/tmp/make-sourceball.$packagename.$UID" @@ -73,7 +70,7 @@ cd "$WORKDIR" echo "Creating Source tarball for $packagename ($reponame-$arch)" -if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then +if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then exit 0 @@ -81,7 +78,7 @@ if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then #trunk sometimes has updated URLs echo ":: Failed to download source, attempting trunk build" rm -rf "$packagename" - if /usr/bin/svn export -q "$svnpath/trunk" "$packagename"; then + if /usr/bin/svn export -q "$SVN_PATH/trunk" "$packagename"; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then echo ":: Source package complete: $pkg_file" -- cgit v1.2.3-2-g168b From f0d817a0deb150f576ee7733f5be40bd981f81cf Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 13:26:02 -0800 Subject: Misc make-sourceball fixes and updates * --allsource places packages in dirs with the pkgname * Syntax errors with if statement and globbing * Set and restore umask Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'misc-scripts/make-sourceball') diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 7a02abf..44c3815 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -18,7 +18,7 @@ srcpath="$FTP_BASE/sources/" WORKDIR="/tmp/make-sourceball.$packagename.$UID" cleanup() { - # unlock + restore_umask rm -rf "$WORKDIR" [ "$1" ] && exit $1 } @@ -50,13 +50,13 @@ create_srcpackage() { mkdir -p "$srcpath" fi #Remove old sourceballs - for pkg in "$srcpath/$pkgname-*"; do + for pkg in "$srcpath/$pkgname-"*; do pkg="$(basename $pkg)" - if "$(getpkgname $pkg)" == "$pkgname" ]; then + if [ "$(getpkgname $pkg)" == "$pkgname" ]; then rm -f "$srcpath/$pkg" fi done - cp $pkg_file "$srcpath" + cp "$pkgname/$pkg_file" "$srcpath" return 0 fi @@ -65,6 +65,7 @@ create_srcpackage() { trap ctrl_c 2 trap cleanup 0 1 +set_umask /bin/mkdir -p "$WORKDIR" cd "$WORKDIR" -- cgit v1.2.3-2-g168b From 671f36cb092ac5b8c8c30f53c19c05b8249bdee0 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 9 Jan 2009 18:14:49 -0500 Subject: Use new BASEDIR facility in make-sourceball Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'misc-scripts/make-sourceball') diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 44c3815..c02a84d 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -5,7 +5,8 @@ if [ $# -ne 3 ]; then exit 1 fi -. "$(dirname $0)/../db-functions" +BASEDIR="$(dirname $0)/../" +. "$BASEDIR/db-functions" source_makepkg @@ -71,7 +72,7 @@ cd "$WORKDIR" echo "Creating Source tarball for $packagename ($reponame-$arch)" -if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then +if /usr/bin/svn export -q "$SVN_PATH/$packagename/repos/$reponame-$arch" $packagename; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then exit 0 @@ -79,7 +80,7 @@ if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then #trunk sometimes has updated URLs echo ":: Failed to download source, attempting trunk build" rm -rf "$packagename" - if /usr/bin/svn export -q "$SVN_PATH/trunk" "$packagename"; then + if /usr/bin/svn export -q "$SVN_PATH/$packagename/trunk" "$packagename"; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then echo ":: Source package complete: $pkg_file" -- cgit v1.2.3-2-g168b From a3fc31dc16b442bf492ab52f9c48d4ea230878d8 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 12 Jan 2009 17:02:53 -0500 Subject: Add license checking to make-sourceball Confirm that the license of a package requires source distribution before building the source tarball TODO: Make sure we can skip this check somehow Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'misc-scripts/make-sourceball') diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index c02a84d..91dc122 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -1,5 +1,8 @@ #!/bin/bash +# Allowed licenses: build only for licenses in this array +ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2') + if [ $# -ne 3 ]; then echo "usage: $(basename $0) " exit 1 @@ -34,10 +37,32 @@ die() { cleanup 1 } +#usage: chk_license ${license[@]}" +chk_license() { + local l + for l in "$@"; do + l="$(echo $l | tr '[:upper:]' '[:lower:]')" + for allowed in ${ALLOWED_LICENSES[@]}; do + allowed="$(echo $allowed | tr '[:upper:]' '[:lower:]')" + if [ "$l" = "$allowed" ]; then + return 0 + fi + done + done + + return 1 +} + create_srcpackage() { if [ -d "$1" ]; then pushd "$1" >/dev/null . "$BUILDSCRIPT" + if ! chk_license ${license[@]}; then + echo "Package license does not require source tarballs. Doing nothing" + echo " license => (${license[@]})" + cleanup 0 + fi + if ! /usr/bin/makepkg --allsource >/dev/null 2>&1; then popd >/dev/null return 1 -- cgit v1.2.3-2-g168b