Author: aurel32
Date: 2008-08-11 02:32:41 +0000 (Mon, 11 Aug 2008)
New Revision: 3083
Modified:
glibc-package/branches/glibc-2.8/debian/quiltrc
glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk
Log:
Apply architecture specific patches *after* the normal patches
Modified: glibc-package/branches/glibc-2.8/debian/quiltrc
===================================================================
--- glibc-package/branches/glibc-2.8/debian/quiltrc 2008-08-11 02:31:42 UTC
(rev 3082)
+++ glibc-package/branches/glibc-2.8/debian/quiltrc 2008-08-11 02:32:41 UTC
(rev 3083)
@@ -1,4 +1,4 @@
QUILT_PATCHES="debian/patches"
QUILT_PATCH_OPTS="--unified-reject-files"
QUILT_DIFF_ARGS="--no-timestamps --no-index"
-QUILT_REFRESH_ARGS="--no-timestamps --no-index"
+QUILT_REFRESH_ARGS="-pab --no-timestamps --no-index --diffstat"
Modified: glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk 2008-08-11
02:31:42 UTC (rev 3082)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk 2008-08-11
02:32:41 UTC (rev 3083)
@@ -9,6 +9,10 @@
patch: $(stamp)patch
$(stamp)patch:
+ @if $(QUILT) next >/dev/null 2>&1; then \
+ echo "Applying patches... "; \
+ $(QUILT) push -a -v ; \
+ fi
@if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
pc=".pc.$(DEB_HOST_ARCH)"; \
mkdir -p "$$pc"; \
@@ -18,20 +22,11 @@
echo "Applying architecture specific patches... "; \
QUILT_PC="$$pc" $(QUILT) push -a -v ; \
fi ; \
- fi ; \
- if $(QUILT) next >/dev/null 2>&1; then \
- echo "Applying patches... "; \
- $(QUILT) push -a -v ; \
fi
touch $@
unpatch:
- @if $(QUILT) previous >/dev/null 2>&1; then \
- echo "Unapplying patches..." ; \
- $(QUILT) pop -a -v ; \
- fi ; \
- rm -rf .pc ; \
- if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
+ @if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
pc=".pc.$(DEB_HOST_ARCH)"; \
QUILT_PC="$$pc" $(QUILT) upgrade || true; \
if QUILT_PC="$$pc" $(QUILT) previous >/dev/null 2>&1; then \
@@ -40,12 +35,17 @@
fi ; \
rm -rf $$pc ; \
fi
+ @if $(QUILT) previous >/dev/null 2>&1; then \
+ echo "Unapplying patches..." ; \
+ $(QUILT) pop -a -v ; \
+ fi ; \
+ rm -rf .pc
rm -f $(stamp)patch
refresh: unpatch
- @while quilt next ; do \
+ @while $(QUILT) next ; do \
$(QUILT) push ; \
- $(QUILT) refresh -pab --no-timestamps --no-index --diffstat ; \
+ $(QUILT) refresh ; \
done ; \
$(QUILT) pop -a
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
