Author: adconrad
Date: 2014-03-20 23:46:15 +0000 (Thu, 20 Mar 2014)
New Revision: 6000
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/rules.d/tarball.mk
Log:
debian/rules.d/tarball.mk: Add an update-from-upstream-git glibc target.
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-03-13 22:22:22 UTC
(rev 5999)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-03-20 23:46:15 UTC
(rev 6000)
@@ -39,6 +39,7 @@
* debian/patches/any/submitted-sysdeps-auxv.diff: Fix implicit declaration
when including <sys/auxv.h> in the testsuite by fixing up header guards.
* expected-results-aarch64-linux-gnu-libc: Tolerate fenv-tls test failure.
+ * debian/rules.d/tarball.mk: Add an update-from-upstream-git glibc target.
[ Aurelien Jarno ]
* debian/debhelper.in/libc.preinst: remove check for sparc32 kernel, the
Modified: glibc-package/branches/eglibc-2.19/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/rules.d/tarball.mk
2014-03-13 22:22:22 UTC (rev 5999)
+++ glibc-package/branches/eglibc-2.19/debian/rules.d/tarball.mk
2014-03-20 23:46:15 UTC (rev 6000)
@@ -6,6 +6,12 @@
DEB_ORIG_REVISION = $(shell cat .svn-revision 2> /dev/null)
SVN_UPDATES_DIFF = debian/patches/svn-updates.diff
+GLIBC_GIT = git://sourceware.org/git/glibc.git
+GLIBC_BRANCH = release/$(EGLIBC_VERSION)/master
+GLIBC_CHECKOUT = glibc-checkout
+GIT_ORIG_REVISION = $(shell cat .git-revision 2>/dev/null || echo
glibc-$(EGLIBC_VERSION))
+GIT_UPDATES_DIFF = debian/patches/git-updates.diff
+
get-orig-source: $(DEB_ORIG)
$(DEB_ORIG):
dh_testdir
@@ -22,3 +28,11 @@
echo "SVN update of $(EGLIBC_SVN)/$(EGLIBC_BRANCH) from revision
$(DEB_ORIG_REVISION)" > $(SVN_UPDATES_DIFF)
echo "" >> $(SVN_UPDATES_DIFF)
svn diff -r$(DEB_ORIG_REVISION) $(EGLIBC_SVN)/$(EGLIBC_BRANCH)/libc |
filterdiff --addoldprefix=a/ --addnewprefix=b/ -x 'manual/*' >>
$(SVN_UPDATES_DIFF)
+
+update-from-upstream-git:
+ dh_testdir
+ git clone --bare $(GLIBC_GIT) $(GLIBC_CHECKOUT)
+ echo "GIT update of $(GLIBC_GIT)/$(GLIBC_BRANCH) from
$(GIT_ORIG_REVISION)" > $(GIT_UPDATES_DIFF)
+ echo "" >> $(GIT_UPDATES_DIFF)
+ (cd $(GLIBC_CHECKOUT) && git diff $(GIT_ORIG_REVISION) $(GLIBC_BRANCH))
| filterdiff -x 'manual/*' >> $(GIT_UPDATES_DIFF)
+ rm -rf $(GLIBC_CHECKOUT)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
