[hurd] 01/04: do a separate build for the udeb variant

[Pino Toscano]

This is an automated email from the git hooks/post-receive script.

pino pushed a commit to branch master
in repository hurd.

commit accea2641a0f6a2e72ac180760c7f7e24596972e
Author: Pino Toscano <address@hidden>
Date:   Mon Sep 23 14:11:14 2013 +0200

    do a separate build for the udeb variant
    
    this way it can have a different configuration:
    - use build-udeb as build dir
    - use debian/tmp-udeb as DESTDIR, and use it as sourcedir for dh_install
      of *-udeb binaries
---
 debian/changelog |    5 +++++
 debian/rules     |   16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d7f1b81..9a45279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ hurd (20130916-2) UNRELEASED; urgency=low
   * Rename the "build" build dir to "build-deb".
   * Force the sourcedir for dh_install to debian/tmp, and strip/fix the paths
     in *.install.in files according to the new root.
+  * Do a separate build for the udeb variant, so it can have a different
+    configuration:
+    - Use build-udeb as build dir.
+    - Use debian/tmp-udeb as DESTDIR, and use it as sourcedir for dh_install
+      of *-udeb binaries.
 
  -- Samuel Thibault <address@hidden>  Tue, 17 Sep 2013 19:42:22 +0200
 
diff --git a/debian/rules b/debian/rules
index 415308d..7b97c2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@
 # 02111-1307 USA.
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
+DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
 
 CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
 SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
@@ -34,14 +35,17 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 
 override_dh_auto_configure:
        dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(shell 
dpkg-buildflags --export=configure)
+       dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS) $(shell 
dpkg-buildflags --export=configure)
 
 override_dh_auto_build:
        dh_auto_build -Bbuild-deb
+       dh_auto_build -Bbuild-udeb
        cd build-deb/doc && make && makeinfo --html --split=chapter 
../../doc/hurd.texi
        $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb
 
 override_dh_auto_clean:
        dh_auto_clean -Bbuild-deb
+       dh_auto_clean -Bbuild-udeb
        $(MAKE) -C libdde-linux26 cleanall
        rm -f $$(find libdde-linux26 -name \*.d)
        rm -fr libdde-linux26/build
@@ -50,6 +54,7 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
        dh_auto_install -Bbuild-deb --destdir= -- prefix=$(DEB_DESTDIR) 
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc 
localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
+       dh_auto_install -Bbuild-udeb --destdir= -- prefix=$(DEB_DESTDIR_UDEB) 
libdir=$(DEB_DESTDIR_UDEB)/lib/$(DEB_HOST_MULTIARCH) 
sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var 
XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
        $(MAKE) -C libdde-linux26 
INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
 
        # runsystem is managed by update-alternatives
@@ -63,6 +68,11 @@ override_dh_auto_install:
        mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
        mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
        mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
+       mkdir -p debian/tmp-udeb/usr/bin
+       mv debian/tmp-udeb/bin/ps debian/tmp-udeb/bin/ps-hurd
+       mv debian/tmp-udeb/bin/uptime debian/tmp-udeb/usr/bin/uptime-hurd
+       mv debian/tmp-udeb/bin/vmstat debian/tmp-udeb/usr/bin/vmstat-hurd
+       mv debian/tmp-udeb/bin/w debian/tmp-udeb/usr/bin/w-hurd
 
        # move away halt and reboot to not conflict with sysvinit
        # (they will be handled as alternatives)
@@ -71,8 +81,10 @@ override_dh_auto_install:
 
        # remove PIC static libraries
        rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
+       rm -f debian/tmp-udeb/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
 
 override_dh_install: $(INSTALL_generated)
+       dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) 
--sourcedir=debian/tmp-udeb
        dh_install --list-missing --sourcedir=debian/tmp
 
 override_dh_installinit:
@@ -94,6 +106,10 @@ override_dh_makeshlibs:
        dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb
        dh_makeshlibs --remaining-packages -Xusr/lib/hurd/
 
+override_dh_clean:
+       dh_clean
+       rm -rf debian/tmp-udeb
+
 debian/%.install: debian/%.install.in
        cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git