From 16e9c2f2afddfbde9fe25f851923e669d1ef77a3 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 25 Apr 2012 19:25:22 -0500 Subject: patch tool: fix so it gets the version from index.html now --- tools/patch-tool-mxe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index c130fae..30580bc 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -16,8 +16,7 @@ gitsdir=~/gits # John Doe author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` -pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/'` +pkg_version=$(sed -n "s/^.* id=\"${pkg}-version\">\([^<]*\)<.*$/\1/p" "${mxedir}/index.html") pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` -- cgit v0.12 From 07c4050afc77598406aafc7c1e8e91bca00bf41c Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 25 Apr 2012 19:25:36 -0500 Subject: patch-tool: use relative directories --- tools/patch-tool-mxe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 30580bc..3937c9c 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -7,10 +7,11 @@ cmd=$1 pkg=$2 # MXE directory -mxedir=~/mxe +mxedir=$(cd $(dirname $0) && cd .. && pwd) # directory for unpacked tarballs/git repos -gitsdir=~/gits +gitsdir=${mxedir}/gits + # John Doe -- cgit v0.12 From f212b7479b0f9257863686f9751813df19cfb225 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 25 Apr 2012 19:25:45 -0500 Subject: patch tool: Ensure the gits directory exists --- tools/patch-tool-mxe | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 3937c9c..8c30eb1 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -12,6 +12,7 @@ mxedir=$(cd $(dirname $0) && cd .. && pwd) # directory for unpacked tarballs/git repos gitsdir=${mxedir}/gits +mkdir -p ${gitsdir} # John Doe -- cgit v0.12 From 46f1e2262ff7c68551ef733e6175bc6f68d2d68a Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:40:30 -0500 Subject: Patch tool: replace elifs with case. Also handles errors. --- tools/patch-tool-mxe | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 8c30eb1..38d4f17 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -73,10 +73,26 @@ function import_patch { git am --keep-cr } -if [ "$cmd" == "init" ]; then - init_git $pkg -elif [ "$cmd" == "import" ]; then - import_patch $pkg -elif [ "$cmd" == "export" ]; then - export_patch $pkg -fi +case "$cmd" in + init) + init_git $pkg + ;; + import) + import_patch $pkg + ;; + export) + export_patch $pkg + ;; + *) + echo "Unrecognized command '${cmd}'" >&2 + cat < Date: Mon, 7 May 2012 12:41:32 -0500 Subject: Patch tool: Move environment variable setup to a function. This keeps us from doing this in case of an incorrect call, making error messages much more sane. --- tools/patch-tool-mxe | 53 ++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 38d4f17..07bd9f6 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -6,42 +6,45 @@ cmd=$1 pkg=$2 -# MXE directory -mxedir=$(cd $(dirname $0) && cd .. && pwd) +setupEnv() { + # MXE directory + export mxedir=$(cd $(dirname $0) && cd .. && pwd) -# directory for unpacked tarballs/git repos -gitsdir=${mxedir}/gits + # directory for unpacked tarballs/git repos + export gitsdir=${mxedir}/gits -mkdir -p ${gitsdir} + mkdir -p ${gitsdir} -# John Doe -author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` + # John Doe + export author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` -pkg_version=$(sed -n "s/^.* id=\"${pkg}-version\">\([^<]*\)<.*$/\1/p" "${mxedir}/index.html") + export pkg_version=$(sed -n "s/^.* id=\"${pkg}-version\">\([^<]*\)<.*$/\1/p" "${mxedir}/index.html") -pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` + export pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` -pkg_subdir=`grep '^$(PKG)_SUBDIR' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$(PKG)'/$pkg/;` + export pkg_subdir=`grep '^$(PKG)_SUBDIR' $mxedir/src/$pkg.mk | \ + sed 's/.*:= \(.*\)/\1/' | \ + sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ + sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ + sed s/'$(PKG)'/$pkg/;` -pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$($(PKG)_SUBDIR)'/$pkg_subdir/ | \ - sed s/'$(PKG)'/$pkg/;` + export pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ + sed 's/.*:= \(.*\)/\1/' | \ + sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ + sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ + sed s/'$($(PKG)_SUBDIR)'/$pkg_subdir/ | \ + sed s/'$(PKG)'/$pkg/;` -#echo $pkg -#echo $pkg_version -#echo $pkg_subdir -#echo $pkg_file + #echo $pkg + #echo $pkg_version + #echo $pkg_subdir + #echo $pkg_file +} # init function init_git { + setupEnv cd $gitsdir echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mxedir/pkg/$pkg_file echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mxedir/pkg/$pkg_file @@ -53,6 +56,7 @@ function init_git { } function export_patch { + setupEnv cd $gitsdir/$pkg_subdir && \ ( echo 'This file is part of MXE.' @@ -66,6 +70,7 @@ function export_patch { } function import_patch { + setupEnv cd $gitsdir/$pkg_subdir && \ cat $mxedir/src/$pkg-1-fixes.patch | \ sed '/^From/,$ !d' | \ -- cgit v0.12 From 8291d7e7f7b43dc70e10e19a07e6b44db7a2570a Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:44:38 -0500 Subject: patch tool: Check for package file, and if it's not there, use makefile to grab it. --- tools/patch-tool-mxe | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 07bd9f6..e2f5e4c 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -46,6 +46,13 @@ setupEnv() { function init_git { setupEnv cd $gitsdir + if [ ! -f $mxedir/pkg/$pkg_file ]; then + make -C "$mxedir" download-$pkg + if [ ! $? -eq 0 ]; then + echo "Could not build target download-$pkg - cancelling init." >&2 + exit 1 + fi + fi echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mxedir/pkg/$pkg_file echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mxedir/pkg/$pkg_file echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mxedir/pkg/$pkg_file | tar xf - -- cgit v0.12 From f0d5c3e6bac4e94f0388f0bbb8b09227fd6c81ad Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:45:03 -0500 Subject: Patch tool: Adding some progress messages to long processes. --- tools/patch-tool-mxe | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index e2f5e4c..48fec9c 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -46,19 +46,28 @@ setupEnv() { function init_git { setupEnv cd $gitsdir + + echo "Checking for cached $pkg_file" if [ ! -f $mxedir/pkg/$pkg_file ]; then make -C "$mxedir" download-$pkg + echo "Building the mxe Makefile target 'download-$pkg' to get missing file" if [ ! $? -eq 0 ]; then echo "Could not build target download-$pkg - cancelling init." >&2 exit 1 fi fi + + echo "Unpacking archive..." echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mxedir/pkg/$pkg_file echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mxedir/pkg/$pkg_file echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mxedir/pkg/$pkg_file | tar xf - echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mxedir/pkg/$pkg_file >> /dev/null + + echo "Initializing repo and adding all as first commit" cd $gitsdir/$pkg_subdir && \ (git init; git add -A; git commit -m "init") > /dev/null + + echo "Tagging distribution tarball state" git tag dist } -- cgit v0.12 From 67e9d224714abd7da233857c1529bfadb479e609 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:55:30 -0500 Subject: patch tool: check preconditions for import. --- tools/patch-tool-mxe | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 48fec9c..5c9a86d 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -87,11 +87,22 @@ function export_patch { function import_patch { setupEnv - cd $gitsdir/$pkg_subdir && \ - cat $mxedir/src/$pkg-1-fixes.patch | \ - sed '/^From/,$ !d' | \ - sed s/'^From: .*'/"From: $author"/'g;' | \ - git am --keep-cr + if [ ! -d $gitsdir/$pkg_subdir ]; then + echo "Error: $gitsdir/$pkg_subdir does not exist, so cannot import patches. Cancelling import - try 'init' first." >&2 + exit 1 + fi + + if [ -f $mxedir/src/$pkg-1-fixes.patch ]; then + cd $gitsdir/$pkg_subdir && \ + cat $mxedir/src/$pkg-1-fixes.patch | \ + sed '/^From/,$ !d' | \ + sed s/'^From: .*'/"From: $author"/'g;' | \ + git am --keep-cr && \ + echo "Imported $mxedir/src/$pkg-1-fixes.patch" + else + echo "patch-tool managed file $mxedir/src/$pkg-1-fixes.patch not found. Cancelling import." >&2 + exit 1 + fi } case "$cmd" in -- cgit v0.12 From 7c10678984e70e1a4b80295824d61d64e10cf49e Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:55:41 -0500 Subject: patch tool: check preconditions for export --- tools/patch-tool-mxe | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 5c9a86d..b9d08f1 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -73,6 +73,11 @@ function init_git { function export_patch { setupEnv + if [ ! -d $gitsdir/$pkg_subdir ]; then + echo "Error: $gitsdir/$pkg_subdir does not exist, so cannot export patches. Cancelling export." >&2 + exit 1 + fi + cd $gitsdir/$pkg_subdir && \ ( echo 'This file is part of MXE.' -- cgit v0.12 From 2958594449c18b29abe37f770d3106af75f916fd Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:55:52 -0500 Subject: patch tool: check preconditions for init --- tools/patch-tool-mxe | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index b9d08f1..aeb9593 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -47,6 +47,11 @@ function init_git { setupEnv cd $gitsdir + if [ -d $gitsdir/$pkg_subdir ]; then + echo "Error: $gitsdir/$pkg_subdir already exists. Cancelling init." >&2 + exit 1 + fi + echo "Checking for cached $pkg_file" if [ ! -f $mxedir/pkg/$pkg_file ]; then make -C "$mxedir" download-$pkg -- cgit v0.12 From 5a93a6a83ae1951f2d36aeacfc0ac26ff5794a2b Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Mon, 7 May 2012 12:56:06 -0500 Subject: patch tool: Add useful status messages --- tools/patch-tool-mxe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index aeb9593..208655a 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -72,8 +72,10 @@ function init_git { cd $gitsdir/$pkg_subdir && \ (git init; git add -A; git commit -m "init") > /dev/null - echo "Tagging distribution tarball state" + echo "Creating 'dist' tag for distribution tarball state" git tag dist + + echo "Repository ready in $gitsdir/$pkg_subdir" } function export_patch { @@ -92,7 +94,8 @@ function export_patch { echo '' git format-patch -p --stdout dist..HEAD | \ sed 's/^From: .*/From: MXE/g;' - ) > $mxedir/src/$pkg-1-fixes.patch + ) > $mxedir/src/$pkg-1-fixes.patch && \ + echo "Generated $mxedir/src/$pkg-1-fixes.patch" } function import_patch { -- cgit v0.12 From caefb69845cf32452de7e7f384e2c762b29ad651 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 25 May 2012 16:09:09 +0200 Subject: package libpaper: add alternate URL --- src/libpaper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libpaper.mk b/src/libpaper.mk index 72ed114..0c8b4b7 100644 --- a/src/libpaper.mk +++ b/src/libpaper.mk @@ -7,6 +7,7 @@ $(PKG)_CHECKSUM := 1f7a810a433a5a68b099aa92777cc2d0b3d03b42 $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL_2 := http://linux.mirrors.es.net/pub/ubuntu/pool/main/libp/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE -- cgit v0.12