Package: src:docker.io
Followup-For: Bug #769351
Control: tags -1 patch

Hi, please find attached a patch implementing this, stealing from the
patch at [1] implementing same thing for gdb-avr.

I have used libc-dev-bin because libc-dev is a virtual package,
libcN-dev has a different N in different architectures.

[1] 
https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=gdb-avr-built-using.diff;att=1;bug=696397

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru docker.io-1.3.3~dfsg1/debian/changelog docker.io-1.3.3~dfsg1/debian/changelog
--- docker.io-1.3.3~dfsg1/debian/changelog	2015-01-03 04:11:48.000000000 -0300
+++ docker.io-1.3.3~dfsg1/debian/changelog	2015-04-03 20:01:49.000000000 -0300
@@ -1,3 +1,10 @@
+docker.io (1.3.3~dfsg1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Built-Using for glibc. Closes: #769351
+
+ -- Felipe Sateler <fsate...@debian.org>  Fri, 03 Apr 2015 20:01:26 -0300
+
 docker.io (1.3.3~dfsg1-2) unstable; urgency=medium
 
   * Add fatal-error-old-kernels.patch to make Docker refuse to start on old,
diff -Nru docker.io-1.3.3~dfsg1/debian/control docker.io-1.3.3~dfsg1/debian/control
--- docker.io-1.3.3~dfsg1/debian/control	2014-12-19 01:00:59.000000000 -0300
+++ docker.io-1.3.3~dfsg1/debian/control	2015-04-03 20:10:40.000000000 -0300
@@ -42,7 +42,7 @@
 Replaces: docker (<< 1.5~)
 Breaks: docker (<< 1.5~)
 Suggests: btrfs-tools, debootstrap, lxc, rinse
-Built-Using: ${misc:Built-Using}
+Built-Using: ${misc:Built-Using}, ${libc:Built-Using}
 Description: Linux container runtime
  Docker complements kernel namespacing with a high-level API which operates at
  the process level. It runs unix processes with strong guarantees of isolation
diff -Nru docker.io-1.3.3~dfsg1/debian/rules docker.io-1.3.3~dfsg1/debian/rules
--- docker.io-1.3.3~dfsg1/debian/rules	2015-01-02 19:41:18.000000000 -0300
+++ docker.io-1.3.3~dfsg1/debian/rules	2015-04-03 20:11:08.000000000 -0300
@@ -12,6 +12,10 @@
 # temporary build path (see http://golang.org/doc/code.html#GOPATH)
 export GOPATH := $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 
+# dockerinit uses static libc
+# Use libc-dev-bin because it is the same package name in all architectures
+BUILT_LIBC := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libc-dev-bin)
+
 # a few helpful variables for deduplication
 INITDIR = /usr/lib/docker.io
 INITPATH = ${INITDIR}/dockerinit
@@ -27,6 +31,7 @@
 APPARMOR_RECOMMENDS = $(shell dpkg-vendor --is Ubuntu && echo apparmor)
 override_dh_gencontrol:
 	echo 'apparmor:Recommends=$(APPARMOR_RECOMMENDS)' >> debian/docker.io.substvars
+	echo 'libc:Built-Using=$(BUILT_LIBC)' >> debian/docker.io.substvars
 	dh_gencontrol
 
 

Reply via email to