* Switch from busybox-cvs to busybox.

* New busybox supports 2.6 modules, so the hack with modutils-udeb is not needed anymore. r28837
20 years ago · 44d395e6f0
parent 69049e116c
commit 44d395e6f0
19 changed files with 8 additions and 25 deletions
--- a/build/pkg-lists/access/common
+++ b/build/pkg-lists/access/common
@ -4,7 +4,6 @@
 localechooser *
 load-floppy
 floppy-retriever *
-busybox-cvs-udeb
 di-utils-terminfo
 cdebconf-text-udeb
 brltty-udeb
--- a/build/pkg-lists/base
+++ b/build/pkg-lists/base
@ -1,5 +1,6 @@
 # These udebs will be needed on nearly every image. Include this file to
 # get them.
+busybox
 anna
 archdetect
 cdebconf-udeb
--- a/build/pkg-lists/bootfloppy/i386.cfg
+++ b/build/pkg-lists/bootfloppy/i386.cfg
@ -4,7 +4,7 @@
 # Neither is much else.
 rootskel-bootfloppy
 di-utils-bootfloppy
-busybox-cvs-floppy-udeb
+busybox-floppy-udeb
 floppy-modules-${kernel:Version}
 fat-modules-${kernel:Version}
 # Include support for USB floppy drives, and other storage media.
--- a/build/pkg-lists/cdrom-apus/common
+++ b/build/pkg-lists/cdrom-apus/common
@ -2,7 +2,6 @@
 #include "kernel"

 # Other udebs that are needed for CDROM install
-busybox-cvs-udeb
 rootskel-locale
 localechooser *
 hw-detect
--- a/build/pkg-lists/cdrom-minimal/common
+++ b/build/pkg-lists/cdrom-minimal/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 # Other udebs that are needed for CDROM install
 rootskel-locale
--- a/build/pkg-lists/cdrom/common
+++ b/build/pkg-lists/cdrom/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 # Other udebs that are needed for CDROM install
 rootskel-locale
--- a/build/pkg-lists/floppy/common
+++ b/build/pkg-lists/floppy/common
@ -11,7 +11,6 @@
 # and so depmod will have a kernel to run against.
 #include "kernel"

-busybox-cvs-udeb
 localechooser *
 bogl-bterm-udeb
 di-utils-terminfo
--- a/build/pkg-lists/generic/common
+++ b/build/pkg-lists/generic/common
@ -2,7 +2,6 @@
 #include "kernel"

 # Other udebs that are needed for netboot install
-busybox-cvs-udeb
 choose-mirror
 net-retriever
 download-installer
--- a/build/pkg-lists/hd-media/common
+++ b/build/pkg-lists/hd-media/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 rootskel-locale
 localechooser *
--- a/build/pkg-lists/kernel_specific/2.2/busybox
+++ b/build/pkg-lists/kernel_specific/2.2/busybox
@ -1,2 +0,0 @@
-# For busybox, just the standard one will do.
-busybox-cvs-udeb
--- a/build/pkg-lists/kernel_specific/2.4/busybox
+++ b/build/pkg-lists/kernel_specific/2.4/busybox
@ -1,2 +0,0 @@
-# For busybox, just the standard one will do.
-busybox-cvs-udeb
--- a/build/pkg-lists/kernel_specific/2.6/busybox
+++ b/build/pkg-lists/kernel_specific/2.6/busybox
@ -1,4 +0,0 @@
-# Unfortunatly, busybox lacks 2.6 modutils support.
-busybox-cvs-udeb
-# Get modutils from here for now.
-module-init-tools-udeb
--- a/build/pkg-lists/monolithic/common
+++ b/build/pkg-lists/monolithic/common
@ -8,8 +8,6 @@
 #include "standard-udebs"
 #include "kernel-module-udebs"

-#include "busybox"
-
 # Other udebs that are not standard priority, but are still needed.
 # Note that some of these are due to broken dependencies of standard
 # priotity udebs.
--- a/build/pkg-lists/nativehd/common
+++ b/build/pkg-lists/nativehd/common
@ -3,7 +3,6 @@
 #include "kernel"

 # Other udebs that are needed for netboot install
-busybox-cvs-udeb
 localechooser *
 choose-mirror
 net-retriever
--- a/build/pkg-lists/netboot-apus/common
+++ b/build/pkg-lists/netboot-apus/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 # Other udebs that are needed for netboot install
 localechooser *
--- a/build/pkg-lists/netboot-minimal/common
+++ b/build/pkg-lists/netboot-minimal/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 # Other udebs that are needed for netboot install
 localechooser *
--- a/build/pkg-lists/netboot/common
+++ b/build/pkg-lists/netboot/common
@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"

 # Other udebs that are needed for netboot install
 localechooser *
--- a/build/pkg-lists/speakup/common
+++ b/build/pkg-lists/speakup/common
@ -4,5 +4,5 @@
 # Neither is much else.
 rootskel-bootfloppy
 di-utils-bootfloppy
-busybox-cvs-floppy-udeb
+busybox-floppy-udeb
 #include "kernel"
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-debian-installer (trunk) UNRELEASED; urgency=low
+debian-installer (20050630) unstable; urgency=low

  [ Joey Hess ]
  * Add preseed-common to all initrds, split out from file/network-preseed.
@ -106,6 +106,9 @@ debian-installer (trunk) UNRELEASED; urgency=low
  * Try to pass appropriate manual_release when building the manual in rules
    file.
  * Switch to slang2.
+  * Switch from busybox-cvs to busybox.
+  * New busybox supports 2.6 modules, so the hack with modutils-udeb is not
+    needed anymore.

  [ Kurt Roeckx ]
  * Changed libdevmapper1.00-udeb to libdevmapper1.01-udeb in the monolithic
@ -161,7 +164,7 @@ debian-installer (trunk) UNRELEASED; urgency=low
  [ Eddy Petrisor ]
  * Removed ASCII characters from needed-characters/vi

- -- Joey Hess <joeyh@debian.org>  Fri, 24 Jun 2005 15:50:52 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Jun 2005 17:03:17 -0400

 debian-installer (20050317) unstable; urgency=low