- Since amd64 is not on standard debian mirrors, and generate_d-i+k_list

must be runnable on them, make it chack for absence of amd64 Packages
      files and add a dummy kernel for amd64. This will need to be manually
      kept up-to-date by the amd64 people for now.
    - Didn't fix generate_di_list the same way, since doing so would be too
      hard. Next time tasks/debian-installer is updated using this script on
      a machine w/o the unofficial amd64 archive, the am64 info in the file
      will be lost.
    - Add DO NOT EDIT warning messages to generated files in cvs.
    - Check and revert manual modifications to tasks/base-sarge. This file is
      automatically generated and those mods would have been lost:
        - Add fileutils to generate_d-i+k_list, "until kernels get fixed",
          whatever that means.
        - arcboot was already in generate_d-i+k_list.
    - Update tasks/debian-installer+kernel using generate_d-i+k_list.
    - Sort package lists in tasks/base-sarge to ease comparisons when
      updating.
    - Update tasks/base-sarge for debootstrap 0.2.45. This includes the
      following removals:
         - aboot: already listed in debian-installer+kernel
         - gcc-3.2-base, libdb2, libgcrypt1, libgnutls7, libident,
           libdb2, libtasn1-0: obsolete
         - modconf: obsoleted by d-i
         - setserial: not base anymore
         - slang1: turned into slang1a-utf8
         - libident: not needed by base anymore
         - lilo: in debian-installer+kernel
         - mbr: not installed anymore
         - pcmcia-cs: in debian-installer+kernel
         - syslinux: not installed
         - "filesutils": typo; fileutils in generate_d-i+k_list for m68k
         - quik: in debian-installer+kernel
         - yaboot: in debian-installer+kernel
         - arcboot: in debian-installer+kernel
         - delo: in debian-installer+kernel
      And the following additions:
         - libdb4.2, libgcrypt11, libgcrypt7, libgnutls10, libgnutls11,
           libgpg-error0, libtasn1-2: new libraries
         - console-tools: now installed by debootstrap even on s390
This commit is contained in:
Joey Hess 2005-01-02 23:31:45 +00:00
parent 5f02810be9
commit 24d88a2b04
5 changed files with 1512 additions and 1492 deletions

40
debian/changelog vendored
View File

@ -26,6 +26,46 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
- Make i386 cds 8.3 filenaming compatible again.
- Workaround the two kernels problem on hppa.
- Fix the kernel-image-2.4.27-amiga thing on generate_di+k_list.
* Joey Hess again:
- Since amd64 is not on standard debian mirrors, and generate_d-i+k_list
must be runnable on them, make it chack for absence of amd64 Packages
files and add a dummy kernel for amd64. This will need to be manually
kept up-to-date by the amd64 people for now.
- Didn't fix generate_di_list the same way, since doing so would be too
hard. Next time tasks/debian-installer is updated using this script on
a machine w/o the unofficial amd64 archive, the am64 info in the file
will be lost.
- Add DO NOT EDIT warning messages to generated files in cvs.
- Check and revert manual modifications to tasks/base-sarge. This file is
automatically generated and those mods would have been lost:
- Add fileutils to generate_d-i+k_list, "until kernels get fixed",
whatever that means.
- arcboot was already in generate_d-i+k_list.
- Update tasks/debian-installer+kernel using generate_d-i+k_list.
- Sort package lists in tasks/base-sarge to ease comparisons when
updating.
- Update tasks/base-sarge for debootstrap 0.2.45. This includes the
following removals:
- aboot: already listed in debian-installer+kernel
- gcc-3.2-base, libdb2, libgcrypt1, libgnutls7, libident,
libdb2, libtasn1-0: obsolete
- modconf: obsoleted by d-i
- setserial: not base anymore
- slang1: turned into slang1a-utf8
- libident: not needed by base anymore
- lilo: in debian-installer+kernel
- mbr: not installed anymore
- pcmcia-cs: in debian-installer+kernel
- syslinux: not installed
- "filesutils": typo; fileutils in generate_d-i+k_list for m68k
- quik: in debian-installer+kernel
- yaboot: in debian-installer+kernel
- arcboot: in debian-installer+kernel
- delo: in debian-installer+kernel
And the following additions:
- libdb4.2, libgcrypt11, libgcrypt7, libgnutls10, libgnutls11,
libgpg-error0, libtasn1-2: new libraries
- console-tools: now installed by debootstrap even on s390
-- Joey Hess <joeyh@debian.org> Mon, 25 Oct 2004 03:03:36 -0400

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,13 @@
/* These files + the ones needed by debootstrap are the ones needed for
* debian-installer to be able to complete the installation of the base.
* at least at this pre-sarge days.
* debian-installer to be able to complete the installation of the base
* system.
*
* This list can be generated with the command:
* ../tools/generate_di+k_list
*
* Last update: Sun Nov 21 16:22:02 MST 2004
* DO NOT EDIT THIS FILE, edit the above script
*
* Last update: Sun Jan 2 15:53:58 MST 2005
*/
#include <debian-installer>
@ -133,6 +135,7 @@ kernel-image-2.6.8-1-sparc64
kernel-image-2.6.8-1-sparc64-smp
#endif
#ifdef ARCH_m68k
fileutils
kernel-image-2.2.25-mac
kernel-image-2.4.27-amiga
kernel-image-2.4.27-atari

View File

@ -7,12 +7,14 @@
DATE=`date`
cat > debian-installer+kernel << EOF
/* These files + the ones needed by debootstrap are the ones needed for
* debian-installer to be able to complete the installation of the base.
* at least at this pre-sarge days.
* debian-installer to be able to complete the installation of the base
* system.
*
* This list can be generated with the command:
* ../tools/generate_di+k_list
*
* DO NOT EDIT THIS FILE, edit the above script
*
* Last update: $DATE
*/
@ -61,13 +63,18 @@ cat >> debian-installer+kernel << EOF
#ifdef ARCH_amd64
EOF
/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
>> debian-installer+kernel
/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
>> debian-installer+kernel
if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then
echo "Cannot find amd64 packages file, inserting static entry as workaround" >&2
echo kernel-image-2.6.8-9-amd64-generic >> debian-installer+kernel
else
/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
>> debian-installer+kernel
/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
>> debian-installer+kernel
fi
cat >> debian-installer+kernel << EOF
#endif
#ifdef ARCH_alpha
@ -173,6 +180,7 @@ EOF
cat >> debian-installer+kernel << EOF
#endif
#ifdef ARCH_m68k
fileutils
EOF
# Get all the 2.2 kernels

View File

@ -13,6 +13,8 @@ print OUT << "EOF";
* This list can be generated with the command:
* ../tools/generate_di_list
*
* DO NOT EDIT THIS FILE, edit the above script
*
* Last update: $DATE
*/
EOF