[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#216950: nmu diff



Package: busybox-cvs
Severity: normal
Version: 20030926-2.1

I have NMUed this package to fix a number of bugs that were delaying
aspects of d-i such as usb floppy support. A diff of my changes is
attached.

-- 
see shy jo
diff -ur old/busybox-cvs-20030926/debian/changelog busybox-cvs-20030926/debian/changelog
--- old/busybox-cvs-20030926/debian/changelog	2003-10-21 16:12:18.000000000 -0400
+++ busybox-cvs-20030926/debian/changelog	2003-10-21 13:08:03.000000000 -0400
@@ -1,3 +1,14 @@
+busybox-cvs (20030926-2.1) unstable; urgency=low
+
+  * NMU
+  * Remove /sbin/init from the udebs, while still leaving init support
+    compiled in. rootskel takes over providing init, but then calls bb init.
+    Remove linuxrc support from the udebs entirely. Closes: #216756
+  * config-floppy-udeb-linux: add minimal find, grep. Closes: #215169
+  * net-udeb-linux-i386: add loopback mount support. Closes: #215613
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 21 Oct 2003 12:47:52 -0400
+
 busybox-cvs (20030926-2) unstable; urgency=low
 
   * debian/config-floppy-udeb-linux
diff -ur old/busybox-cvs-20030926/debian/config-floppy-udeb-linux busybox-cvs-20030926/debian/config-floppy-udeb-linux
--- old/busybox-cvs-20030926/debian/config-floppy-udeb-linux	2003-10-21 16:12:19.000000000 -0400
+++ busybox-cvs-20030926/debian/config-floppy-udeb-linux	2003-10-21 13:19:10.000000000 -0400
@@ -160,8 +160,17 @@
 #
 # Finding Utilities
 #
-# CONFIG_FIND is not set
-# CONFIG_GREP is not set
+CONFIG_FIND=y
+# CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_PERM is not set
+# CONFIG_FEATURE_FIND_TYPE is not set
+# CONFIG_FEATURE_FIND_XDEV is not set
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_GREP=y
+# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
 # CONFIG_XARGS is not set
 
 #
diff -ur old/busybox-cvs-20030926/debian/config-net-udeb-linux-i386 busybox-cvs-20030926/debian/config-net-udeb-linux-i386
--- old/busybox-cvs-20030926/debian/config-net-udeb-linux-i386	2003-09-26 09:13:06.000000000 -0400
+++ busybox-cvs-20030926/debian/config-net-udeb-linux-i386	2003-10-21 13:06:25.000000000 -0400
@@ -205,7 +205,7 @@
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_HALT is not set
diff -ur old/busybox-cvs-20030926/debian/config-udeb busybox-cvs-20030926/debian/config-udeb
--- old/busybox-cvs-20030926/debian/config-udeb	2003-10-21 16:12:18.000000000 -0400
+++ busybox-cvs-20030926/debian/config-udeb	2003-10-21 13:05:02.000000000 -0400
@@ -208,7 +208,7 @@
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 CONFIG_HALT=y
diff -ur old/busybox-cvs-20030926/debian/config-udeb-linux busybox-cvs-20030926/debian/config-udeb-linux
--- old/busybox-cvs-20030926/debian/config-udeb-linux	2003-10-21 16:12:19.000000000 -0400
+++ busybox-cvs-20030926/debian/config-udeb-linux	2003-10-21 13:06:06.000000000 -0400
@@ -208,7 +208,7 @@
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 CONFIG_HALT=y
diff -ur old/busybox-cvs-20030926/debian/config-udeb-linux-i386 busybox-cvs-20030926/debian/config-udeb-linux-i386
--- old/busybox-cvs-20030926/debian/config-udeb-linux-i386	2003-09-26 09:13:06.000000000 -0400
+++ busybox-cvs-20030926/debian/config-udeb-linux-i386	2003-10-21 13:03:38.000000000 -0400
@@ -208,7 +208,7 @@
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 CONFIG_HALT=y
@@ -406,7 +406,7 @@
 #
 # Common options for mount/umount
 #
-# CONFIG_FEATURE_MOUNT_LOOP is not set
+CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 
 #
diff -ur old/busybox-cvs-20030926/debian/rules busybox-cvs-20030926/debian/rules
--- old/busybox-cvs-20030926/debian/rules	2003-10-21 16:12:18.000000000 -0400
+++ busybox-cvs-20030926/debian/rules	2003-10-21 13:07:54.000000000 -0400
@@ -83,6 +83,9 @@
 	$(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 $@
 

Attachment: signature.asc
Description: Digital signature


Reply to: