# HG changeset patch # User Eric Joseph-Alexandre # Date 1358420873 -3600 # Node ID 8d049d40ee223cd9206e441415d17bdd076dcfb9 # Parent 9da0e2756a59dce8e25363f44187e09073f35ee7 tazdev: change relpkg behavior. retrieve the last version from .hgtags. Put archive in /src diff -r 9da0e2756a59 -r 8d049d40ee22 tazdev/tazdev --- a/tazdev/tazdev Thu Jan 17 10:29:00 2013 +0100 +++ b/tazdev/tazdev Thu Jan 17 12:07:53 2013 +0100 @@ -12,7 +12,7 @@ # Pascal Bellard # -VERSION=1.8 +VERSION=1.9 . /lib/libtaz.sh @@ -346,12 +346,19 @@ relpkg|-rp) # Release a slitaz sub-project and upload tarball to mirror [ -z "$MIRROR_SOURCES" ] && MIRROR_SOURCES="/var/www/slitaz/mirror/sources" - if [ -z $2 ] || [ -z $3 ]; then - echo -e "\nUsage: $0 relpkg package version\n" + if [ -z $2 ]; then + echo -e "\nUsage: $0 relpkg package [version]\n" exit 0 fi pkg=$2 - version=$3 + + # We can get the last found version in .hgtags + if [ -z $3 ]; then + version=$(tail -n 1 $PROJECTS/$pkg/.hgtags | awk '{print $2'}) + else + version=$3 + fi + echo "" && cd $PROJECTS/$pkg # Sanity check @@ -363,8 +370,8 @@ # Archive echo -n "Creating tarball and md5sum for: $pkg-$version... " - hg archive -t tgz $pkg-$version.tar.gz - md5sum $pkg-$version.tar.gz > $pkg-$version.md5 + hg archive -t tgz $SOURCE/$pkg-$version.tar.gz + ( cd $SOURCE; md5sum $pkg-$version.tar.gz > $pkg-$version.md5 ) echo "Done" # Upload @@ -373,7 +380,7 @@ if [ "$upload" = "y" ]; then echo "Uploading to: $MIRROR/sources/${pkg#slitaz-}" scp $pkg-$version.tar.gz $pkg-$version.md5 \ - $user@$MIRROR:$MIRROR_SOURCES/${pkg#slitaz-} + $MIRROR:$MIRROR_SOURCES/${pkg#slitaz-} fi # Update pkg in wok diff -r 9da0e2756a59 -r 8d049d40ee22 tazdev/tazdev.conf --- a/tazdev/tazdev.conf Thu Jan 17 10:29:00 2013 +0100 +++ b/tazdev/tazdev.conf Thu Jan 17 12:07:53 2013 +0100 @@ -7,6 +7,9 @@ # Path to all own and copy projects. PROJECTS="$HOME/Projects" +# Path to archive +SOURCE=$SLITAZ_HOME/src + # Packages to generate a minimal chroot. CHROOT_PKGS="slitaz-base-files busybox cookutils tazpkg lzma"