← Commit list

6fc6d7fe4

Glenn L McGrath

2002-12-01

FAILED Duration: 11s

Subject

Patch from Bastian Blank (waldi) for debian installer

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

debian/changelog +2 -2 debian/config-deb +1 -0 debian/config-static +5 -11 debian/config-udeb +11 -24 debian/control +9 -9 debian/rules +109 -70

debian/changelog+2 -2

@@ -1,9 +1,9 @@
-	busybox-unstable (1:0.61.pre.custom) unstable; urgency=low
+	busybox-cvs (0.61.pre-custom1) unstable; urgency=low

	* This is just to make it easier to make custom debs
	* Replace this changelog before makeing offical debs

-	-- Glenn McGrath <bug1@home> Thu, 28 Nov 2002 10:25:43 +1100
+	-- Bastian Blank <[email protected]> Sun, 01 Dec 2002 02:02:46 +0100

	busybox (1:0.60.0-1) unstable; urgency=low

debian/config-deb+1 -0

@@ -300,6 +300,7 @@ CONFIG_WC=y
	CONFIG_DMESG=y
	# CONFIG_FBSET is not set
	# CONFIG_FDFLUSH is not set
+	# CONFIG_FDISK is not set
	# CONFIG_FREERAMDISK is not set
	# CONFIG_FSCK_MINIX is not set
	# CONFIG_MKFS_MINIX is not set

debian/config-static+5 -11

@@ -177,17 +177,10 @@ CONFIG_WATCHDOG=y
	#
	# Module Utilities
	#
-	CONFIG_INSMOD=y
-	CONFIG_LSMOD=y
-	CONFIG_MODPROBE=y
-	CONFIG_RMMOD=y
-	# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
-	CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
-	CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
-	CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
-	# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-	CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
-	CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+	# CONFIG_INSMOD is not set
+	# CONFIG_LSMOD is not set
+	# CONFIG_MODPROBE is not set
+	# CONFIG_RMMOD is not set

	#
	# Networking Utilities
@@ -357,6 +350,7 @@ CONFIG_FBSET=y
	CONFIG_FEATURE_FBSET_FANCY=y
	CONFIG_FEATURE_FBSET_READMODE=y
	CONFIG_FDFLUSH=y
+	# CONFIG_FDISK is not set
	CONFIG_FREERAMDISK=y
	CONFIG_FSCK_MINIX=y
	CONFIG_MKFS_MINIX=y

debian/config-udeb+11 -24

@@ -121,7 +121,7 @@ CONFIG_FEATURE_USE_INITTAB=y
	CONFIG_FEATURE_INITRD=y
	# CONFIG_FEATURE_INIT_COREDUMPS is not set
	# CONFIG_FEATURE_EXTRA_QUIET is not set
-	# CONFIG_HALT is not set
+	CONFIG_HALT=y
	# CONFIG_POWEROFF is not set
	CONFIG_REBOOT=y
	# CONFIG_START_STOP_DAEMON is not set
@@ -161,22 +161,16 @@ CONFIG_REBOOT=y
	# Module Utilities
	#
	# CONFIG_INSMOD is not set
-	CONFIG_LSMOD=y
+	# CONFIG_LSMOD is not set
	# CONFIG_MODPROBE is not set
	# CONFIG_RMMOD is not set
-	# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set

	#
	# Networking Utilities
	#
	# CONFIG_FEATURE_IPV6 is not set
	# CONFIG_HOSTNAME is not set
-	CONFIG_IFCONFIG=y
-	CONFIG_FEATURE_IFCONFIG_STATUS=y
-	# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-	CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-	CONFIG_FEATURE_IFCONFIG_HW=y
-	# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+	# CONFIG_IFCONFIG is not set
	# CONFIG_IFUPDOWN is not set
	CONFIG_IP=y
	CONFIG_FEATURE_IP_ADDRESS=y
@@ -189,10 +183,10 @@ CONFIG_FEATURE_IP_ROUTE=y
	# CONFIG_NSLOOKUP is not set
	CONFIG_PING=y
	CONFIG_FEATURE_FANCY_PING=y
-	CONFIG_ROUTE=y
+	# CONFIG_ROUTE is not set
	CONFIG_TELNET=y
	CONFIG_FEATURE_TELNET_TTYPE=y
-	# CONFIG_TELNETD is not set
+	CONFIG_TELNETD=y
	# CONFIG_TFTP is not set
	# CONFIG_TRACEROUTE is not set
	CONFIG_WGET=y
@@ -222,20 +216,12 @@ CONFIG_PS=y
	#
	# Bourne Shell
	#
-	CONFIG_FEATURE_SH_IS_ASH=y
+	# CONFIG_FEATURE_SH_IS_ASH is not set
	# CONFIG_FEATURE_SH_IS_HUSH is not set
	# CONFIG_FEATURE_SH_IS_LASH is not set
	# CONFIG_FEATURE_SH_IS_MSH is not set
-	# CONFIG_FEATURE_SH_IS_NONE is not set
-	CONFIG_ASH=y
-	CONFIG_ASH=y
-	# CONFIG_ASH_JOB_CONTROL is not set
-	CONFIG_ASH_ALIAS=y
-	# CONFIG_ASH_MATH_SUPPORT is not set
-	# CONFIG_ASH_GETOPTS is not set
-	# CONFIG_ASH_CMDCMD is not set
-	# CONFIG_ASH_MAIL is not set
-	CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+	CONFIG_FEATURE_SH_IS_NONE=y
+	# CONFIG_ASH is not set
	# CONFIG_HUSH is not set
	# CONFIG_LASH is not set
	# CONFIG_MSH is not set
@@ -291,11 +277,11 @@ CONFIG_SYSLOGD=y
	#
	CONFIG_CAT=y
	# CONFIG_CMP is not set
-	CONFIG_CUT=y
+	# CONFIG_CUT is not set
	# CONFIG_DOS2UNIX is not set
	CONFIG_HEAD=y
	# CONFIG_LENGTH is not set
-	CONFIG_MD5SUM=y
+	# CONFIG_MD5SUM is not set
	# CONFIG_OD is not set
	CONFIG_SORT=y
	# CONFIG_FEATURE_SORT_REVERSE is not set
@@ -314,6 +300,7 @@ CONFIG_WC=y
	CONFIG_DMESG=y
	# CONFIG_FBSET is not set
	# CONFIG_FDFLUSH is not set
+	# CONFIG_FDISK is not set
	CONFIG_FREERAMDISK=y
	# CONFIG_FSCK_MINIX is not set
	# CONFIG_MKFS_MINIX is not set

debian/control+9 -9

@@ -1,21 +1,21 @@
-	Source: busybox-unstable
+	Source: busybox-cvs
	Priority: optional
	Maintainer: Erik Andersen <[email protected]>
	Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0)
	Build-Depends-Indep: sgmltools-lite, w3m
	Standards-Version: 3.2.1.0

-	Package: busybox-unstable-doc
+	Package: busybox-cvs-doc
	Architecture: all
	Section: doc
	Description: Documentation for busybox
	Documentation in various formats on busybox commands and their options.

-	Package: busybox-unstable
+	Package: busybox-cvs
	Architecture: any
	Depends: ${shlibs:Depends}
-	Conflicts: busybox-unstable-static, busybox, busybox-static
-	Replaces: busybox-unstable-static, busybox, busybox-static
+	Conflicts: busybox-cvs-static, busybox, busybox-static
+	Replaces: busybox-cvs-static, busybox, busybox-static
	Section: utils
	Description: Tiny utilities for small and embedded systems.
	BusyBox combines tiny versions of many common UNIX utilities into a single
@@ -31,11 +31,11 @@ Description: Tiny utilities for small and embedded systems.
	to install BusyBox to the current directory (you do not want to do this
	in / on your Debian system!).

-	Package: busybox-unstable-static
+	Package: busybox-cvs-static
	Architecture: any
	Depends: ${shlibs:Depends}
-	Conflicts: busybox-unstable, busybox-static, busybox
-	Replaces: busybox-unstable, busybox-static, busybox
+	Conflicts: busybox-cvs, busybox-static, busybox
+	Replaces: busybox-cvs, busybox-static, busybox
	Section: shells
	Description: Standalone rescue shell with tons of builtin utilities.
	BusyBox combines tiny versions of many common UNIX utilities into a single
@@ -53,7 +53,7 @@ Description: Standalone rescue shell with tons of builtin utilities.
	your system from certain destruction. Invoke "busybox", and it will list the
	available builtin commands.

-	Package: busybox-unstable-udeb
+	Package: busybox-cvs-udeb
	Architecture: any
	Depends: ${shlibs:Depends}
	Section: debian-installer

debian/rules+109 -70

@@ -1,90 +1,129 @@
	#!/usr/bin/make -f

-	export DH_VERBOSE=1
+	# Uncomment this to turn on verbose mode.
+	#export DH_VERBOSE=1
+
+	# This is the debhelper compatibility version to use.
	export DH_COMPAT=3

-	# These wont actually do anything yet, need to hack Rules.mak
+	VERSION = $(shell dpkg-parsechangelog \| grep ^Version: \| cut -d ' ' -f 2)
+	ARCH = $(shell dpkg --print-architecture)
+
	ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
+	DODEBUG = true
	endif
-	ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+	ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	DODEBUG = true
	endif

-	busybox-deb:
-	dh_testdir
-	dh_testroot
+	build-arch: build-arch-stamp
+	build-arch-stamp:
	$(MAKE) clean
	cp ./debian/config-deb .config
-	cp ./debian/Rules.mak.shared Rules.mak
	$(MAKE) dep
-	$(MAKE)
-	install -D busybox ./debian/busybox-unstable/bin/busybox
-	dh_installchangelogs Changelog -pbusybox-unstable
-	dh_installdocs -pbusybox-unstable
-	dh_strip -pbusybox-unstable
-	dh_compress -pbusybox-unstable
-	dh_fixperms -pbusybox-unstable
-	dh_installdeb -pbusybox-unstable
-	dh_shlibdeps -pbusybox-unstable
-	dh_gencontrol -pbusybox-unstable
-	dh_md5sums -pbusybox-unstable
-	dh_builddeb -pbusybox-unstable
-
-	busybox-udeb:
-	dh_testdir
-	dh_testroot
+	$(MAKE) DODEBUG=$(DODEBUG)
+	install busybox busybox-deb
+
+	$(MAKE) clean
+	cp ./debian/config-static .config
+	$(MAKE) dep
+	$(MAKE) DOSTATIC=true DODEBUG=$(DODEBUG)
+	install busybox busybox-static
+
	$(MAKE) clean
	cp ./debian/config-udeb .config
-	cp ./debian/Rules.mak.shared Rules.mak
	$(MAKE) dep
-	$(MAKE)
-	$(MAKE) PREFIX=./debian/busybox-udeb/ install
-	dh_strip -pbusybox-unstable-udeb
-	dh_compress -pbusybox-unstable-udeb
-	dh_fixperms -pbusybox-unstable-udeb
-	dh_installdeb -pbusybox-unstable-udeb
-	dh_shlibdeps -pbusybox-unstable-udeb
-	dh_gencontrol -pbusybox-unstable-udeb
-	dh_md5sums -pbusybox-unstable-udeb
-	dh_builddeb -pbusybox-unstable-udeb
-
-
-	busybox-static:
+	$(MAKE) DODEBUG=$(DODEBUG)
+
+	touch build-arch-stamp
+
+	build-indep: build-indep-stamp
+	build-indep-stamp:
+	$(MAKE) newdoc
+
+	touch build-indep-stamp
+
+	build: build-arch build-indep
+
+	clean:
	dh_testdir
	dh_testroot
-	$(MAKE) clean
-	cp ./debian/config-static .config
-	cp ./debian/Rules.mak.static Rules.mak
-	$(MAKE) dep
-	$(MAKE)
-	install -D busybox ./debian/busybox-unstable-static/bin/busybox
-	dh_installchangelogs Changelog -pbusybox-unstable-static
-	dh_installdocs -pbusybox-unstable-static
-	dh_strip -pbusybox-unstable-static
-	dh_compress -pbusybox-unstable-static
-	dh_fixperms -pbusybox-unstable-static
-	dh_installdeb -pbusybox-unstable-static
-	dh_shlibdeps -pbusybox-unstable-static
-	dh_gencontrol -pbusybox-unstable-static
-	dh_md5sums -pbusybox-unstable-static
-	dh_builddeb -pbusybox-unstable-static
-
-	binary-arch: busybox-deb busybox-udeb busybox-static
-
-	binary-indep:
+	rm -f build-arch-stamp build-indep-stamp
+
+	$(MAKE) distclean
+	-rm -f busybox-deb busybox-static
+
+	dh_clean
+
+	install: build-arch
	dh_testdir
	dh_testroot
-	$(MAKE) clean
-	$(MAKE) newdoc
-	dh_installdocs -pbusybox-unstable-doc
-	dh_installchangelogs Changelog -pbusybox-unstable-doc
-	dh_compress -pbusybox-unstable-doc
-	dh_fixperms -pbusybox-unstable-doc
-	dh_installdeb -pbusybox-unstable-doc
-	dh_gencontrol -pbusybox-unstable-doc
-	dh_md5sums -pbusybox-unstable-doc
-	dh_builddeb -pbusybox-unstable-doc
+	dh_clean -k
+	dh_installdirs
+
+	install busybox-deb $(CURDIR)/debian/busybox-cvs/bin/busybox
+	install busybox-static $(CURDIR)/debian/busybox-cvs-static/bin/busybox
+	$(MAKE) PREFIX=$(CURDIR)/debian/busybox-cvs-udeb install
+
+	# Build architecture-independent files here.
+	# Pass -i to all debhelper commands in this target to reduce clutter.
+	binary-indep: build
+	dh_testdir -i
+	dh_testroot -i
+	# dh_installdebconf -i
+	dh_installdocs -i
+	# dh_installexamples -i
+	# dh_installmenu -i
+	# dh_installlogrotate -i
+	# dh_installemacsen -i
+	# dh_installpam -i
+	# dh_installmime -i
+	# dh_installinit -i
+	# dh_installcron -i
+	# dh_installman -i
+	# dh_installinfo -i
+	# dh_undocumented -i
+	dh_installchangelogs Changelog -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	# dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+	# Build architecture-dependent files here.
+	binary-arch: build-arch install
+	dh_testdir -a
+	dh_testroot -a
+	# dh_installdebconf -a
+	dh_installdocs -a -Nbusybox-cvs-udeb
+	# 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 -a
+	# dh_installinfo -a
+	# dh_undocumented -a
+	dh_installchangelogs Changelog -a -Nbusybox-cvs-udeb
+	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_gencontrol -a
+	dh_md5sums -a -Nbusybox-cvs-udeb
+	dh_builddeb -a -Nbusybox-cvs-udeb
+	dpkg-distaddfile busybox-cvs-udeb-$(VERSION)_$(ARCH).udeb debian-installer optional
+	dh_builddeb -pbusybox-cvs-udeb --filename=busybox-cvs-udeb-$(VERSION)_$(ARCH).udeb

	binary: binary-indep binary-arch
-	.PHONY: build clean binary-indep binary-arch binary install configure
+	.PHONY: build clean binary-indep binary-arch binary install