On Tue, Sep 22, 2009 at 7:01 PM, Eric Bélanger <[email protected]> wrote: > On Tue, Sep 22, 2009 at 5:08 PM, Aaron Griffin <[email protected]> > wrote: >> On Tue, Sep 22, 2009 at 4:00 PM, Eric Bélanger <[email protected]> >> wrote: >>> On Tue, Sep 22, 2009 at 4:29 PM, Aaron Griffin <[email protected]> >>> wrote: >>>> On Mon, Sep 21, 2009 at 3:23 PM, Aaron Griffin <[email protected]> >>>> wrote: >>>>> On Fri, Sep 18, 2009 at 11:52 PM, Eric Bélanger <[email protected]> >>>>> wrote: >>>>>> On Fri, Sep 18, 2009 at 4:22 PM, Aaron Griffin <[email protected]> >>>>>> wrote: >>>>>>> See /arch-test/ >>>>>>> > > There seems to be problems with split package I believe. I'll wait > until it finish running to look into it further. The "Failed to > download source for" error are, at first look, because of missing > source/md5sums.: > > Errors occured during run: > Failed to download source for tzdata-2009l-1 (core-i686) > Failed to download source for xfsprogs-3.0.1-2 (core-i686) > Failed to download source for tzdata-2009l-1 (core-x86_64) > Failed to download source for xfsprogs-3.0.1-2 (core-x86_64) > Failed to download source for aria2-1.5.2-1 (extra-i686) > Failed to download source for enca-1.10-1 (extra-i686) > Failed to download source for gmpc-0.19.0-1 (extra-i686) > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeaccessibility-colorschemes-4.3.1-1.src.tar.gz': No > such file or directory > cp: cannot stat `kdeadmin-kcron-4.3.1-1.src.tar.gz': No such file or directory > cp: cannot stat `kdeadmin-kcron-4.3.1-1.src.tar.gz': No such file or directory > cp: cannot stat `kdeadmin-kcron-4.3.1-1.src.tar.gz': No such file or directory > cp: cannot stat `kdeadmin-kcron-4.3.1-1.src.tar.gz': No such file or directory > >
Attached is an untested patch to fix split package support in sourceballs script. It uses the package name as indicated in the script arguments instead of the incorrect one sourced from the PKGBUILD.
From 9f37f71bd9114c02ed1f2d5ba18814a10dc7febb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=E9langer?= <[email protected]> Date: Tue, 22 Sep 2009 22:21:15 -0400 Subject: [PATCH] Fixed split packages support in sourceballs script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger <[email protected]> --- misc-scripts/make-sourceball | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 11fac06..3d42f13 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -69,23 +69,23 @@ create_srcpackage() { pushd "$1" >/dev/null . "$BUILDSCRIPT" - echo "Creating source tarball for $pkgname-$pkgver-$pkgrel" + echo "Creating source tarball for $packagename-$pkgver-$pkgrel" if ! chk_license ${licen...@]}; then #Removed so as not to clutter failed.txt - #echo -e "\t$pkgname license (${licen...@]}) does not require source tarballs" >&2 + #echo -e "\t$packagename license (${licen...@]}) does not require source tarballs" >&2 cleanup 0 fi - local logfile="$logpath/$pkgname" + local logfile="$logpath/$packagename" if ! /usr/bin/makepkg --allsource --ignorearch >"$logfile" 2>&1; then popd >/dev/null /bin/gzip -f -9 "$logfile" - die "\tFailed to download source for $pkgname-$pkgver-$pkgrel ($reponame-$_arch)" + die "\tFailed to download source for $packagename-$pkgver-$pkgrel ($reponame-$_arch)" fi /bin/rm -f "$logfile"{,.gz} - local pkg_file="${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" + local pkg_file="${packagename}-${pkgver}-${pkgrel}${SRCEXT}" if [ ! -d "$srcpath" ]; then mkdir -p "$srcpath" @@ -109,9 +109,9 @@ remove_old() { cd .. done - for pkg in "$srcpath/$pkgname-"*; do + for pkg in "$srcpath/$packagename-"*; do [ -f "$pkg" ] || continue - if [ "$(getpkgname $pkg)" == "$pkgname" ]; then + if [ "$(getpkgname $pkg)" == "$packagename" ]; then skip=0 pver="$(getpkgver $pkg)" for v in $PKGVERS; do @@ -139,7 +139,7 @@ set_umask cd "$WORKDIR" if /usr/bin/svn export -q "$SVNREPO/$packagename" $packagename; then - remove_old "$pkgname/repos/" + remove_old "$packagename/repos/" create_srcpackage "$packagename/repos/$reponame-$_arch" else die "\tPackage '$packagename' does not exist in repo '$reponame-$_arch'" -- 1.6.4.4
