Changeset 990 in MondoRescue for branches/stable/mindi-busybox

Timestamp:

Nov 27, 2006, 12:46:59 AM (17 years ago)

Author:

Bruno Cornec

Message:

We now have a correct mindi-busybox package for Debian

Location:

branches/stable/mindi-busybox/distributions/debian

Files:

• control (modified) (1 diff)
• rules (modified) (3 diffs)

branches/stable/mindi-busybox/distributions/debian/control

@@ -8 +8 @@
 Package: mindi-busybox
 Architecture: amd64 i386 ia64
-Depends: binutils, bzip2, module-init-tools
 Description: creates a busybox version suited for mindi
  Mindi is a script to create boot/root disks based on your system. It uses 

branches/stable/mindi-busybox/distributions/debian/rules

@@ -9 +9 @@
 PACKAGE_NAME = mindi-busybox
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Don't set any compiler flags - busybox does that just fine
 
-CFLAGS = -Wall
+configure: configure-stamp
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
+configure-stamp:
     dh_testdir
-    # Configure the package.
-    CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+    touch configure-stamp
 
 # Build both architecture dependent and independent
-build: build-arch build-indep
+build: build-stamp
 
-# Build architecture dependent
-build-arch: build-arch-stamp
-
-build-arch-stamp:  config.status
+build-stamp: configure-stamp
     dh_testdir
 
     # Compile the package.
+    mv .config .config.sav
+    $(MAKE) distclean
+    mv .config.sav .config
     $(MAKE) oldconfig
     $(MAKE) busybox
@@ -45 +32 @@
     touch build-stamp
 
-# Build architecture independent
-build-indep: build-indep-stamp
-
-build-indep-stamp:  config.status
-    # Nothing to do, the only indep item is the manual which is available as html in original source
-    touch build-indep-stamp
-
 clean:
     dh_testdir
     dh_testroot
-    rm -f build-arch-stamp build-indep-stamp
+    rm -f build-stamp configure-stamp
     # Clean temporary document directory
     rm -rf debian/doc-temp
     # Clean up.
+    -mv .config .config.sav
     -$(MAKE) distclean
-    rm -f config.log
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-    cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-    cp -f /usr/share/misc/config.guess config.guess
-endif
+    -mv .config.sav .config
+    -rm -f busybox
 
     dh_clean
 
 # Install architecture dependent and independent
-install: install-arch install-indep
-
-# Install architecture dependent
-install-arch: build-arch
+install: build
     dh_testdir
     dh_testroot
-    dh_clean -k -s
-    dh_installdirs -s
+    dh_clean -k
+    dh_installdirs
 
     # Install the package files into build directory:
@@ -85 +58 @@
     # - copy doc
     mkdir -p debian/doc-temp
-    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO changelog svn.log debian/doc-temp/html
+    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO changelog svn.log debian/doc-temp
 
     dh_install -s
 
-# Install architecture independent
-install-indep: build-indep
+# Build architecture independant packages using the common target.
+binary-indep: build install
+    # None
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
     dh_testdir
     dh_testroot
-    dh_clean -k -i
-    dh_installdirs -i
-    dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-    dh_testdir
-    dh_testroot
-    dh_installchangelogs ChangeLog
     dh_installdocs
-    dh_installman
-    dh_link
     dh_strip
     dh_compress
     dh_fixperms
     dh_installdeb
-    dh_shlibdeps
     dh_gencontrol
     dh_md5sums
     dh_builddeb
 
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-    $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-    $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Build architecture depdendent and independent packages
 binary: binary-arch binary-indep
-.PHONY: clean binary
+.PHONY: build clean binary-indep binary-arch binary install configure