[glibc] 02/02: debian/rules, debian/rules.d/build.mk: do not capture the build path when generating glibc-source tarball. Closes: #861183.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit acdbb25ecf4682d47acc7b02a47a51655ba14691
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Jun 13 22:58:11 2017 +0200
debian/rules, debian/rules.d/build.mk: do not capture the build path when generating glibc-source tarball. Closes: #861183.
---
debian/changelog | 2 ++
debian/rules | 3 +--
debian/rules.d/build.mk | 16 ++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9de0c10..6cc8560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ glibc (2.24-12) UNRELEASED; urgency=medium
* debian/debhelper.in/libc.templates: update the kernel 3.2 warning to
mention that the support limitation comes from Debian and not from
upstream. Closes: #864720.
+ * debian/rules, debian/rules.d/build.mk: do not capture the build path
+ when generating glibc-source tarball. Closes: #861183.
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2017 22:44:42 +0200
diff --git a/debian/rules b/debian/rules
index d58d9ee..a7a6ed1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,7 @@ shlib_dep = $(libc) (>= $(shlib_dep_ver))
DEB_BUILDDIR ?= $(build-tree)/$(DEB_HOST_ARCH)-$(curpass)
DEB_BUILDDIRLIBC ?= $(build-tree)/$(DEB_HOST_ARCH)-libc
-GLIBC_SOURCES = $(addprefix $(shell basename $(CURDIR))/, \
- $(filter-out debian $(shell basename $(stamp)) $(build-tree), $(wildcard *)))
+GLIBC_SOURCES = $(filter-out debian $(shell basename $(stamp)) $(build-tree), $(wildcard *))
# Support multiple makes at once based on number of processors
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 1e9174e..03c3ef9 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -317,14 +317,14 @@ $(stamp)build_locales-all: $(stamp)/build_libc
$(stamp)source: $(stamp)patch
mkdir -p $(build-tree)
- cd .. && \
- find $(GLIBC_SOURCES) -print0 | \
- LC_ALL=C sort -z | \
- tar -c -J --null --no-recursion -T - \
- --mode=go=rX,u+rw,a-s \
- --clamp-mtime --mtime "@$(SOURCE_DATE_EPOCH)" \
- --owner=root --group=root --numeric-owner \
- -f $(CURDIR)/$(build-tree)/glibc-$(GLIBC_VERSION).tar.xz
+ find $(GLIBC_SOURCES) -print0 | \
+ LC_ALL=C sort -z | \
+ tar -c -J --null --no-recursion -T - \
+ --mode=go=rX,u+rw,a-s \
+ --clamp-mtime --mtime "@$(SOURCE_DATE_EPOCH)" \
+ --owner=root --group=root --numeric-owner \
+ --xform='s=^=glibc-$(GLIBC_VERSION)/=' \
+ -f $(CURDIR)/$(build-tree)/glibc-$(GLIBC_VERSION).tar.xz
mkdir -p debian/glibc-source/usr/src/glibc
tar cf - --files-from debian/glibc-source.filelist \
--clamp-mtime --mtime "@$(SOURCE_DATE_EPOCH)" \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: