Sync to waldi's subversion archive

1 files changed, 81 insertions, 58 deletions

diff --git a/debian/rules b/debian/rules
index 82bf9f04a..e77b4ef96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 
@@ -18,25 +17,39 @@ endif
 
 PACKAGE_PREFIX = busybox-cvs
 
+ARCH_FLOPPY_UDEB = $(shell sh debian/control-extract Architecture $(PACKAGE_PREFIX)-floppy-udeb)
+
 PACKAGES_DEB = $(PACKAGE_PREFIX) $(PACKAGE_PREFIX)-static
 PACKAGES_UDEB = $(PACKAGE_PREFIX)-udeb
-ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),)
-PACKAGES_UDEB += $(PACKAGE_PREFIX)-net-udeb
+ifneq ($(filter $(DEB_HOST_ARCH),$(ARCH_FLOPPY_UDEB)),)
+PACKAGES_UDEB += $(PACKAGE_PREFIX)-floppy-udeb
 endif
 PACKAGES = $(PACKAGES_DEB) $(PACKAGES_UDEB)
+
 DEBHELPER_PACKAGES_DEB = $(patsubst %,-p%,$(PACKAGES_DEB))
+DEBHELPER_PACKAGES_UDEB = $(patsubst %,-p%,$(PACKAGES_UDEB))
+
+CONFIG = $(firstword $(wildcard ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM)-$(DEB_HOST_GNU_CPU) ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM) ./debian/config-$(1)))
+CONFIG_DEB = $(call CONFIG,deb)
+CONFIG_STATIC = $(call CONFIG,static)
+CONFIG_UDEB = $(call CONFIG,udeb)
+CONFIG_FLOPPY_UDEB = $(call CONFIG,floppy-udeb)
+
+configure: configure-stamp
+configure-stamp:
+        sh ./configure
+
+        touch $@
 
-build-arch: build-arch-deb build-arch-static build-arch-udeb build-arch-net-udeb build-arch-doc
+build-arch: build-arch-deb-all build-arch-udeb-all
+build-arch-deb-all: build-arch-deb build-arch-static build-arch-doc
+build-arch-udeb-all: build-arch-udeb build-arch-floppy-udeb
 
 build-arch-deb: build-arch-deb-stamp
-build-arch-deb-stamp:
+build-arch-deb-stamp: configure-stamp
         $(MAKE) clean
 
-ifeq ($(wildcard ./debian/config-deb-$(DEB_HOST_ARCH)),)
-        cp ./debian/config-deb .config
-else
-        cp ./debian/config-deb-$(DEB_HOST_ARCH) .config
-endif
+        cp $(CONFIG_DEB) .config
 
         $(MAKE) dep
         $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
@@ -47,14 +60,10 @@ endif
         touch $@
 
 build-arch-static: build-arch-static-stamp
-build-arch-static-stamp:
+build-arch-static-stamp: configure-stamp
         $(MAKE) clean
 
-ifeq ($(wildcard ./debian/config-static-$(DEB_HOST_ARCH)),)
-        cp ./debian/config-static .config
-else
-        cp ./debian/config-static-$(DEB_HOST_ARCH) .config
-endif
+        cp $(CONFIG_STATIC) .config
 
         $(MAKE) dep
         $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
@@ -65,39 +74,38 @@ endif
         touch $@
 
 build-arch-udeb: build-arch-udeb-stamp
-build-arch-udeb-stamp:
+build-arch-udeb-stamp: configure-stamp
         $(MAKE) clean
 
-ifeq ($(wildcard ./debian/config-udeb-$(DEB_HOST_ARCH)),)
-        cp ./debian/config-udeb .config
-else
-        cp ./debian/config-udeb-$(DEB_HOST_ARCH) .config
-endif
+        cp $(CONFIG_UDEB) .config
 
         $(MAKE) dep
         $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
         $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-udeb install
+        # Remove init link, but init support is still compiled in to be
+        # used.
+        rm -f $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/sbin/init
 
         touch $@
 
-build-arch-net-udeb: build-arch-net-udeb-stamp
-build-arch-net-udeb-stamp:
-ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),)
+build-arch-floppy-udeb: build-arch-floppy-udeb-stamp
+build-arch-floppy-udeb-stamp: configure-stamp
+ifneq ($(filter $(DEB_HOST_ARCH),$(ARCH_FLOPPY_UDEB)),)
         $(MAKE) clean
 
-        cp ./debian/config-net-udeb-$(DEB_HOST_ARCH) .config
+        cp $(CONFIG_FLOPPY_UDEB) .config
 
         $(MAKE) dep
         $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG)
 
-        $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-net-udeb install
+        $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-floppy-udeb install
 endif
 
         touch $@
 
 build-arch-doc: build-arch-doc-stamp
-build-arch-doc-stamp:
+build-arch-doc-stamp: configure-stamp
         $(MAKE) docs/BusyBox.1
 
         cp docs/BusyBox.1 busybox.1
@@ -109,20 +117,20 @@ build: build-arch
 clean:
         dh_testdir
         dh_testroot
-        rm -f build-*-stamp debian/files~
+        rm -f build-*-stamp configure-stamp debian/files~
 
-        $(MAKE) distclean
+        -$(MAKE) distclean
         -rm -rf busybox-deb busybox-static install* busybox.1
 
         dh_clean
 
-install: build-arch
+install-deb: build-arch-deb-all
         dh_testdir
         dh_testroot
-        dh_clean -k
-        dh_installdirs
+        dh_clean -k $(DEBHELPER_PACKAGES_DEB)
+        dh_installdirs $(DEBHELPER_PACKAGES_DEB)
 
-        for i in $(PACKAGES); do \
+        for i in $(PACKAGES_DEB); do \
         ( \
                 cd install-$$i; \
                 find -type d -exec install -d $(CURDIR)/debian/$$i/{} \;; \
@@ -133,36 +141,51 @@ install: build-arch
         install -m644 debian/$(PACKAGE_PREFIX)-static.override \
                 debian/$(PACKAGE_PREFIX)-static/usr/share/lintian/overrides/$(PACKAGE_PREFIX)-static
 
+install-udeb: build-arch-udeb-all
+        dh_testdir
+        dh_testroot
+        dh_clean -k $(DEBHELPER_PACKAGES_UDEB)
+        dh_installdirs $(DEBHELPER_PACKAGES_UDEB)
+
+        for i in $(PACKAGES_UDEB); do \
+        ( \
+                cd install-$$i; \
+                find -type d -exec install -d $(CURDIR)/debian/$$i/{} \;; \
+                find \( -type f -o -type l \) -exec cp -a {} $(CURDIR)/debian/$$i/{} \;; \
+        ); \
+        done
+
+binary-arch: binary-arch-deb binary-arch-udeb
+
 # Build architecture-dependent files here.
-binary-arch: build-arch install
-        dh_testdir -a
-        dh_testroot -a
-#       dh_installdebconf -a
+binary-arch-deb: build-arch-deb-all install-deb
+        dh_testdir
+        dh_testroot
         dh_installdocs $(DEBHELPER_PACKAGES_DEB)
-#       dh_installexamples -a
-#       dh_installmenu -a
-#       dh_installlogrotate -a
-#       dh_installemacsen -a
-#       dh_installpam -a
-#       dh_installmime -a
-#       dh_installinit -a
-#       dh_installcron -a
         dh_installman $(DEBHELPER_PACKAGES_DEB)
-#       dh_installinfo -a
-#       dh_undocumented -a
         dh_installchangelogs Changelog $(DEBHELPER_PACKAGES_DEB)
-        dh_strip -a
-        dh_link -a
-        dh_compress -a
-        dh_fixperms -a
-#       dh_makeshlibs -a
-        dh_installdeb -a
-#       dh_perl -a
-        dh_shlibdeps -a
+        dh_strip $(DEBHELPER_PACKAGES_DEB)
+        dh_link $(DEBHELPER_PACKAGES_DEB)
+        dh_compress $(DEBHELPER_PACKAGES_DEB)
+        dh_fixperms $(DEBHELPER_PACKAGES_DEB)
+        dh_installdeb $(DEBHELPER_PACKAGES_DEB)
+        dh_shlibdeps $(DEBHELPER_PACKAGES_DEB)
         dh_gencontrol $(DEBHELPER_PACKAGES_DEB)
         dh_md5sums $(DEBHELPER_PACKAGES_DEB)
         dh_builddeb $(DEBHELPER_PACKAGES_DEB)
 
+# Build architecture-dependent files here.
+binary-arch-udeb: build-arch-udeb-all install-udeb
+        dh_testdir
+        dh_testroot
+        dh_strip $(DEBHELPER_PACKAGES_UDEB)
+        dh_link $(DEBHELPER_PACKAGES_UDEB)
+        dh_compress $(DEBHELPER_PACKAGES_UDEB)
+        dh_fixperms $(DEBHELPER_PACKAGES_UDEB)
+        dh_installdeb $(DEBHELPER_PACKAGES_UDEB)
+        dh_shlibdeps $(DEBHELPER_PACKAGES_UDEB)
+        dh_gencontrol $(DEBHELPER_PACKAGES_DEB)
+
         $(foreach PACKAGE, $(PACKAGES_UDEB), \
         dh_gencontrol -p$(PACKAGE) -- -fdebian/files~; \
         dpkg-distaddfile $(PACKAGE)_$(VERSION)_$(DEB_HOST_ARCH).udeb debian-installer extra; \