[Glibc-bsd-commits] r1523 - in trunk/web/patches/debian-only: . d-i
Robert Millan
rmh at costa.debian.org
Sat Apr 29 09:19:29 UTC 2006
Author: rmh
Date: 2006-04-29 09:19:26 +0000 (Sat, 29 Apr 2006)
New Revision: 1523
Added:
trunk/web/patches/debian-only/d-i/
trunk/web/patches/debian-only/d-i/kernel-wedge.diff
trunk/web/patches/debian-only/d-i/kfreebsd-kernel-di-i386.diff
trunk/web/patches/debian-only/d-i/mklibs.diff
Log:
Add d-i patches.
Added: trunk/web/patches/debian-only/d-i/kernel-wedge.diff
===================================================================
--- trunk/web/patches/debian-only/d-i/kernel-wedge.diff 2006-04-29 09:18:43 UTC (rev 1522)
+++ trunk/web/patches/debian-only/d-i/kernel-wedge.diff 2006-04-29 09:19:26 UTC (rev 1523)
@@ -0,0 +1,330 @@
+Index: commands/copy-modules
+===================================================================
+--- commands/copy-modules (revision 36777)
++++ commands/copy-modules (working copy)
+@@ -56,7 +56,7 @@
+ # Prefer modules in the kernel subdir, but failing
+ # that search the whole thing, to find third-party,
+ # etc modules.
+- match="$(find $moddir/kernel $moddir \
++ match="$(find `ls -d $moddir/kernel 2>/dev/null` $moddir \
+ -name $module.o -or -name $module.ko \
+ | head -n 1 | sed "s!$moddir/!!")"
+
+@@ -78,6 +78,7 @@
+ flavour=$2
+ installedname=$3
+ arch=$(dpkg-architecture -qDEB_HOST_ARCH)
++os=$(dpkg-architecture -qDEB_HOST_ARCH_OS)
+ home=$PWD
+
+ trap 'rm -rf $tmpdir' EXIT
+@@ -105,29 +106,31 @@
+ modlistdir=modules/$arch
+ fi
+
+-if [ ! -e "$moddir/modules.dep" ]; then
+- echo "no $moddir/modules.dep. This file is required by kernel-wedge" >&2
+- exit 1
+-fi
++if [ "$os" = "linux" ] ; then
++ if [ ! -e "$moddir/modules.dep" ]; then
++ echo "no $moddir/modules.dep. This file is required by kernel-wedge" >&2
++ exit 1
++ fi
+
+-# get module dependencies from modules.dep
+-# sort it by field 2
+-perl -lne '
+- @words=split(" ");
+- s!'/lib/modules/$installedname'/!! foreach (@words);
+- if ($words[0] =~ /:$/) {
+- $words[0]=~s/:$//;
+- $module=shift @words;
+- }
+- foreach (@words) {
+- print "$module\t$_" unless $_ eq "\\";
+- }
+-' $moddir/modules.dep | sort -k 2,2 > $tmpdir/deps
+-
+-if [ ! -s $tmpdir/deps ] && [ ! -e $home/no-modules ]; then
+- echo "No module interdependencies found. This probably means your modules.dep is broken." >&2
+- echo "If this is intentional, touch $home/no-modules" >&2
+- exit 1
++ # get module dependencies from modules.dep
++ # sort it by field 2
++ perl -lne '
++ @words=split(" ");
++ s!'/lib/modules/$installedname'/!! foreach (@words);
++ if ($words[0] =~ /:$/) {
++ $words[0]=~s/:$//;
++ $module=shift @words;
++ }
++ foreach (@words) {
++ print "$module\t$_" unless $_ eq "\\";
++ }
++ ' $moddir/modules.dep | sort -k 2,2 > $tmpdir/deps
++
++ if [ ! -s $tmpdir/deps ] && [ ! -e $home/no-modules ]; then
++ echo "No module interdependencies found. This probably means your modules.dep is broken." >&2
++ echo "If this is intentional, touch $home/no-modules" >&2
++ exit 1
++ fi
+ fi
+
+ mkdir $tmpdir/module-deps $tmpdir/module-list
+Index: commands/install-files
+===================================================================
+--- commands/install-files (revision 36777)
++++ commands/install-files (working copy)
+@@ -44,11 +44,19 @@
+ "$sourcedir/boot/vmlinux-$installedname",
+ "debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinux$extraname");
+ }
+- else {
++ elsif (-e "$sourcedir/boot/vmlinuz-$installedname") {
+ doit("install", "-D", "-m", 644,
+ "$sourcedir/boot/vmlinuz-$installedname",
+ "debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinuz$extraname");
+ }
++ elsif (-e "$sourcedir/boot/kfreebsd-$installedname.gz") {
++ doit("install", "-D", "-m", 644,
++ "$sourcedir/boot/kfreebsd-$installedname.gz",
++ "debian/kernel-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz");
++ }
++ else {
++ die "could not find kernel image";
++ }
+ doit("install", "-D", "-m", 644,
+ "$sourcedir/boot/System.map-$installedname",
+ "debian/kernel-image-$kernelversion-$flavour-di/boot/System.map$extraname")
+Index: modules/kfreebsd/floppy-modules
+===================================================================
+--- modules/kfreebsd/floppy-modules (revision 0)
++++ modules/kfreebsd/floppy-modules (revision 0)
+@@ -0,0 +1,2 @@
++fdc
++atapifd ?
+Index: modules/kfreebsd/loop-modules
+===================================================================
+--- modules/kfreebsd/loop-modules (revision 0)
++++ modules/kfreebsd/loop-modules (revision 0)
+@@ -0,0 +1,3 @@
++loop ?
++# aka cloop
++geom_uzip ?
+Index: modules/kfreebsd/nic-modules
+===================================================================
+--- modules/kfreebsd/nic-modules (revision 0)
++++ modules/kfreebsd/nic-modules (revision 0)
+@@ -0,0 +1,16 @@
++# Some very common nic modules.
++# 3Com Etherlink III
++if_ep ?
++# RealTek 8129/8139
++if_rl ?
++# Intel PRO/100 Ethernet
++if_fxp ?
++# National Semiconductor
++sis
++# ne2k
++if_ed ?
++#tg3
++# aka "tulip" ?
++if_dc ?
++# Winbond W89C840F
++if_wb ?
+Index: modules/kfreebsd/fat-modules
+===================================================================
+--- modules/kfreebsd/fat-modules (revision 0)
++++ modules/kfreebsd/fat-modules (revision 0)
+@@ -0,0 +1,2 @@
++msdosfs
++msdosfs_iconv ?
+Index: modules/kfreebsd/acpi-modules
+===================================================================
+--- modules/kfreebsd/acpi-modules (revision 0)
++++ modules/kfreebsd/acpi-modules (revision 0)
+@@ -0,0 +1 @@
++acpi
+Index: modules/kfreebsd/serial-modules
+===================================================================
+--- modules/kfreebsd/serial-modules (revision 0)
++++ modules/kfreebsd/serial-modules (revision 0)
+@@ -0,0 +1 @@
++sio ?
+Index: modules/kfreebsd/reiserfs-modules
+===================================================================
+--- modules/kfreebsd/reiserfs-modules (revision 0)
++++ modules/kfreebsd/reiserfs-modules (revision 0)
+@@ -0,0 +1,2 @@
++# Not available currently on all kernel versions, so marked optional.
++reiserfs ?
+Index: modules/kfreebsd/ext2-modules
+===================================================================
+--- modules/kfreebsd/ext2-modules (revision 0)
++++ modules/kfreebsd/ext2-modules (revision 0)
+@@ -0,0 +1 @@
++ext2fs
+Index: modules/kfreebsd/ipv6-modules
+===================================================================
+--- modules/kfreebsd/ipv6-modules (revision 0)
++++ modules/kfreebsd/ipv6-modules (revision 0)
+@@ -0,0 +1,2 @@
++if_gif
++if_faith
+Index: modules/kfreebsd/nfs-modules
+===================================================================
+--- modules/kfreebsd/nfs-modules (revision 0)
++++ modules/kfreebsd/nfs-modules (revision 0)
+@@ -0,0 +1 @@
++nfsclient
+Index: modules/kfreebsd/scsi-core-modules
+===================================================================
+--- modules/kfreebsd/scsi-core-modules (revision 0)
++++ modules/kfreebsd/scsi-core-modules (revision 0)
+@@ -0,0 +1,4 @@
++scbus ?
++ch ?
++da ?
++sa ?
+Index: modules/kfreebsd/scsi-common-modules
+===================================================================
+--- modules/kfreebsd/scsi-common-modules (revision 0)
++++ modules/kfreebsd/scsi-common-modules (revision 0)
+@@ -0,0 +1,4 @@
++aic ?
++aic7xxx ?
++bt ?
++sym ?
+Index: modules/kfreebsd/parport-modules
+===================================================================
+--- modules/kfreebsd/parport-modules (revision 0)
++++ modules/kfreebsd/parport-modules (revision 0)
+@@ -0,0 +1,2 @@
++ppc ?
++ppbus ?
+Index: modules/kfreebsd/ide-core-modules
+===================================================================
+--- modules/kfreebsd/ide-core-modules (revision 0)
++++ modules/kfreebsd/ide-core-modules (revision 0)
+@@ -0,0 +1 @@
++ata ?
+Index: modules/kfreebsd/usb-modules
+===================================================================
+--- modules/kfreebsd/usb-modules (revision 0)
++++ modules/kfreebsd/usb-modules (revision 0)
+@@ -0,0 +1,4 @@
++ohci ?
++uhci ?
++ehci ?
++usb ?
+Index: modules/kfreebsd/cdrom-core-modules
+===================================================================
+--- modules/kfreebsd/cdrom-core-modules (revision 0)
++++ modules/kfreebsd/cdrom-core-modules (revision 0)
+@@ -0,0 +1,3 @@
++# SCSI cd
++cd ?
++atapicd ?
+Index: modules/kfreebsd/usb-storage-modules
+===================================================================
+--- modules/kfreebsd/usb-storage-modules (revision 0)
++++ modules/kfreebsd/usb-storage-modules (revision 0)
+@@ -0,0 +1 @@
++umass ?
+Index: modules/kfreebsd/pcmcia-modules
+===================================================================
+--- modules/kfreebsd/pcmcia-modules (revision 0)
++++ modules/kfreebsd/pcmcia-modules (revision 0)
+@@ -0,0 +1,6 @@
++# cardbus (yenta) bridge
++cbb ?
++# PC Card (16-bit) bus
++pccard ?
++# CardBus (32-bit) bus
++cardbus ?
+Index: modules/kfreebsd/ufs-modules
+===================================================================
+--- modules/kfreebsd/ufs-modules (revision 0)
++++ modules/kfreebsd/ufs-modules (revision 0)
+@@ -0,0 +1 @@
++ufs ?
+Index: modules/kfreebsd/ppp-modules
+===================================================================
+--- modules/kfreebsd/ppp-modules (revision 0)
++++ modules/kfreebsd/ppp-modules (revision 0)
+@@ -0,0 +1,5 @@
++if_ppp
++ng_ppp
++ng_pppoe
++ng_sppp
++sppp
+Index: modules/kfreebsd/md-modules
+===================================================================
+--- modules/kfreebsd/md-modules (revision 0)
++++ modules/kfreebsd/md-modules (revision 0)
+@@ -0,0 +1 @@
++md ?
+Index: modules/kfreebsd/nic-usb-modules
+===================================================================
+--- modules/kfreebsd/nic-usb-modules (revision 0)
++++ modules/kfreebsd/nic-usb-modules (revision 0)
+@@ -0,0 +1,12 @@
++# ADMtek USB Ethernet
++aue ?
++# ASIX Electronics USB Ethernet
++axe ?
++# Generic USB over Ethernet
++cdce ?
++# CATC USB Ethernet
++cue ?
++# Kawasaki LSI USB Ethernet
++kue ?
++# RealTek RTL8150 USB Ethernet
++rue ?
+Index: modules/kfreebsd/xfs-modules
+===================================================================
+--- modules/kfreebsd/xfs-modules (revision 0)
++++ modules/kfreebsd/xfs-modules (revision 0)
+@@ -0,0 +1,2 @@
++# Not available currently on all kernel versions, so marked optional.
++xfs ?
+Index: modules/kfreebsd/ide-modules
+===================================================================
+--- modules/kfreebsd/ide-modules (revision 0)
++++ modules/kfreebsd/ide-modules (revision 0)
+@@ -0,0 +1,4 @@
++atadisk ?
++ataraid ?
++cd9660 ?
++cd9660_iconv ?
+Index: modules/kfreebsd/firewire-core-modules
+===================================================================
+--- modules/kfreebsd/firewire-core-modules (revision 0)
++++ modules/kfreebsd/firewire-core-modules (revision 0)
+@@ -0,0 +1,5 @@
++firewire ?
++# SCSI over FireWire (Requires scbus and da)
++sbp ?
++# Ethernet over FireWire (non-standard!)
++fwe ?
+Index: modules/kfreebsd/nic-pcmcia-modules
+===================================================================
+--- modules/kfreebsd/nic-pcmcia-modules (revision 0)
++++ modules/kfreebsd/nic-pcmcia-modules (revision 0)
+@@ -0,0 +1,2 @@
++# Common pcmcia nic modules.
++if_ed ?
+Index: modules/kfreebsd/plip-modules
+===================================================================
+--- modules/kfreebsd/plip-modules (revision 0)
++++ modules/kfreebsd/plip-modules (revision 0)
+@@ -0,0 +1 @@
++plip
+Index: modules/kfreebsd/isa-pnp-modules
+===================================================================
+--- modules/kfreebsd/isa-pnp-modules (revision 0)
++++ modules/kfreebsd/isa-pnp-modules (revision 0)
+@@ -0,0 +1 @@
++isa ?
Added: trunk/web/patches/debian-only/d-i/kfreebsd-kernel-di-i386.diff
===================================================================
--- trunk/web/patches/debian-only/d-i/kfreebsd-kernel-di-i386.diff 2006-04-29 09:18:43 UTC (rev 1522)
+++ trunk/web/patches/debian-only/d-i/kfreebsd-kernel-di-i386.diff 2006-04-29 09:19:26 UTC (rev 1523)
@@ -0,0 +1,343 @@
+Index: kfreebsd-kernel-di-i386/debian/control
+===================================================================
+--- kfreebsd-kernel-di-i386/debian/control (revision 0)
++++ kfreebsd-kernel-di-i386/debian/control (revision 0)
+@@ -0,0 +1,163 @@
++Source: kfreebsd-kernel-di-i386
++Section: debian-installer
++Priority: optional
++Maintainer: Debian Install System Team <debian-boot at lists.debian.org>
++Uploaders: Joey Hess <joeyh at debian.org>, Frans Pop <fjp at debian.org>
++Build-Depends: kernel-wedge (>= 2.20___________________________________________XXXXXXXXXXXX_FIXME), kfreebsd-image-6.0-1-486 [kfreebsd-i386]
++
++Package: kernel-image-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: kernel-image, ufs-modules
++Depends: acpi-modules-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: extra
++Description: Linux kernel binary image for the Debian installer
++ This package contains the Linux kernel image for the Debian installer
++ boot images. It does _not_ provide a usable kernel for your full
++ Debian system.
++
++Package: nic-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: nic-modules
++Depends: kernel-image-6.0-1-486-di, nic-shared-modules-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: Common NIC drivers
++ This package contains common NIC drivers for the Linux kernel.
++
++Package: nic-shared-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: nic-shared-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: Shared NIC drivers
++ This package contains NIC drivers needed by combinations of nic-modules,
++ nic-extra-modules, and nic-pcmcia-modules.
++
++Package: ppp-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: ppp-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: optional
++Description: PPP drivers
++ This package contains PPP drivers for the Linux kernel.
++
++Package: ide-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: ide-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: IDE drivers
++ This package contains IDE drivers for the Linux kernel.
++
++Package: plip-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: plip-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: optional
++Description: PLIP drivers
++ This package contains PLIP drivers for the Linux kernel.
++
++Package: floppy-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: floppy-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: Floppy driver
++ This package contains the floppy driver for the Linux kernel.
++
++Package: loop-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: loop-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: Loopback filesystem support
++ This package contains loopback filesystem support for the Linux kernel.
++
++Package: ipv6-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: ipv6-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: extra
++Description: IPv6 driver
++ This package contains the IPv6 driver for the Linux kernel.
++
++Package: ntfs-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: ntfs-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: extra
++Description: NTFS filesystem support
++ This package contains the NTFS file system module for the Linux kernel.
++
++Package: reiserfs-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: reiserfs-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: Reiser filesystem support
++ This package contains the Reiser filesystem module for the Linux kernel.
++
++Package: fat-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: fat-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: standard
++Description: FAT filesystem support
++ This package contains the FAT and VFAT filesystem modules for the Linux kernel.
++
++Package: mouse-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: mouse-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: extra
++Description: Mouse support
++ This package contains mouse drivers for the Linux kernel.
++
++Package: acpi-modules-6.0-1-486-di
++XC-Package-Type: udeb
++Provides: acpi-modules
++Depends: kernel-image-6.0-1-486-di
++Architecture: kfreebsd-i386
++XB-Kernel-Version: 6.0-1-486
++Section: debian-installer
++Priority: extra
++Description: ACPI support modules
++ This package contains linux kernel modules for ACPI.
+Index: kfreebsd-kernel-di-i386/debian/changelog
+===================================================================
+--- kfreebsd-kernel-di-i386/debian/changelog (revision 0)
++++ kfreebsd-kernel-di-i386/debian/changelog (revision 0)
+@@ -0,0 +1,5 @@
++kfreebsd-kernel-di-i386 (0.1) UNRELEASED; urgency=low
++
++ * First upload.
++
++ -- Robert Millan <rmh at aybabtu.com> Thu, 27 Apr 2006 20:50:53 +0200
+Index: kfreebsd-kernel-di-i386/debian/copyright
+===================================================================
+--- kfreebsd-kernel-di-i386/debian/copyright (revision 0)
++++ kfreebsd-kernel-di-i386/debian/copyright (revision 0)
+@@ -0,0 +1,5 @@
++This package is Copyright (c) 2001-2002 Herbert Xu <herbert at debian.org>
++and Copyright 2001, 2003 by Joey Hess <joeyh at debian.org>.
++
++It is licensed under the terms of the GNU GPL, see
++/usr/share/common-licenses/GPL
+Index: kfreebsd-kernel-di-i386/debian/rules
+===================================================================
+--- kfreebsd-kernel-di-i386/debian/rules (revision 0)
++++ kfreebsd-kernel-di-i386/debian/rules (revision 0)
+@@ -0,0 +1,2 @@
++#!/usr/bin/make -f
++include /usr/share/kernel-wedge/generic-rules
+
+Property changes on: kfreebsd-kernel-di-i386/debian/rules
+___________________________________________________________________
+Name: svn:executable
+ + *
+
+Index: kfreebsd-kernel-di-i386/debian/control.stub
+===================================================================
+--- kfreebsd-kernel-di-i386/debian/control.stub (revision 0)
++++ kfreebsd-kernel-di-i386/debian/control.stub (revision 0)
+@@ -0,0 +1,6 @@
++Source: kfreebsd-kernel-di-i386
++Section: debian-installer
++Priority: optional
++Maintainer: Debian Install System Team <debian-boot at lists.debian.org>
++Uploaders: Joey Hess <joeyh at debian.org>, Frans Pop <fjp at debian.org>
++Build-Depends: kernel-wedge (>= 2.20___________________________________________XXXXXXXXXXXX_FIXME)
+Index: kfreebsd-kernel-di-i386/package-list
+===================================================================
+--- kfreebsd-kernel-di-i386/package-list (revision 0)
++++ kfreebsd-kernel-di-i386/package-list (revision 0)
+@@ -0,0 +1,29 @@
++# This file is used to build up the control file. The kernel version and
++# "-di" are appended to the package names. Section can be left out. So can
++# architecture, which is derived from the files in the modules directory.
++# It overwrites specifications from /usr/share/kernel-wedge/package-list.
++#
++Package: kernel-image
++Depends: acpi-modules
++Provides: ufs-modules
++
++Package: fat-modules
++Priority: standard
++
++Package: nic-modules
++Depends: kernel-image, nic-shared-modules, firmware-modules, firewire-core-modules
++
++Package: scsi-modules
++Depends: kernel-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, firmware-modules
++
++Package: nic-extra-modules
++Depends: kernel-image, isa-pnp-modules, nic-shared-modules, firmware-modules, crc-modules
++
++Package: nic-usb-modules
++Depends: kernel-image, nic-shared-modules, usb-modules, firmware-modules
++
++Package: ppp-modules
++Depends: serial-modules, kernel-image, crc-modules
++
++Package: pcmcia-modules
++Depends: kernel-image, isa-pnp-modules, firmware-modules
+Index: kfreebsd-kernel-di-i386/kernel-versions
+===================================================================
+--- kfreebsd-kernel-di-i386/kernel-versions (revision 0)
++++ kfreebsd-kernel-di-i386/kernel-versions (revision 0)
+@@ -0,0 +1,2 @@
++# arch version flavour installedname suffix build-depends
++kfreebsd-i386 6.0-1 486 6.0-1-486 - kfreebsd-image-6.0-1-486
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/floppy-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/loop-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/loop-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/loop-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/loop-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-modules (revision 0)
+@@ -0,0 +1 @@
++#include <kfreebsd/nic-modules>
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/fat-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/fat-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/fat-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/fat-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/kernel-image
+===================================================================
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ntfs-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ntfs-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ntfs-modules (revision 0)
+@@ -0,0 +1,2 @@
++ntfs
++ntfs_iconv
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/acpi-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/acpi-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/acpi-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/acpi-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-shared-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-shared-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/nic-shared-modules (revision 0)
+@@ -0,0 +1 @@
++miibus ?
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ppp-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ppp-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ppp-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/ppp-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ide-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ide-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ide-modules (revision 0)
+@@ -0,0 +1 @@
++#include <kfreebsd/ide-modules>
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/reiserfs-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/reiserfs-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/reiserfs-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/reiserfs-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ipv6-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ipv6-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/ipv6-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/ipv6-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/plip-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/plip-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/plip-modules (revision 0)
+@@ -0,0 +1,2 @@
++#include <kfreebsd/plip-modules>
++
+Index: kfreebsd-kernel-di-i386/modules/kfreebsd-i386/mouse-modules
+===================================================================
+--- kfreebsd-kernel-di-i386/modules/kfreebsd-i386/mouse-modules (revision 0)
++++ kfreebsd-kernel-di-i386/modules/kfreebsd-i386/mouse-modules (revision 0)
+@@ -0,0 +1,2 @@
++psm ?
++ums
Added: trunk/web/patches/debian-only/d-i/mklibs.diff
===================================================================
--- trunk/web/patches/debian-only/d-i/mklibs.diff 2006-04-29 09:18:43 UTC (rev 1522)
+++ trunk/web/patches/debian-only/d-i/mklibs.diff 2006-04-29 09:19:26 UTC (rev 1523)
@@ -0,0 +1,24 @@
+diff -ur mklibs-0.1.20.old/debian/control mklibs-0.1.20/debian/control
+--- mklibs-0.1.20.old/debian/control 2005-11-05 15:30:50.000000000 +0100
++++ mklibs-0.1.20/debian/control 2006-04-28 17:22:26.000000000 +0200
+@@ -9,7 +9,7 @@
+ Package: mklibs
+ Architecture: all
+ Depends: python2.4, binutils, gcc
+-Recommends: libc6-pic | libc6.1-pic
++Recommends: libc6-pic | glibc-pic
+ Description: Shared library reduction script
+ mklibs produces cut-down shared libraries that contain only the
+ routines required by a particular set of executables. This is
+diff -ur mklibs-0.1.20.old/src/mklibs.py mklibs-0.1.20/src/mklibs.py
+--- mklibs-0.1.20.old/src/mklibs.py 2006-01-10 19:27:17.000000000 +0100
++++ mklibs-0.1.20/src/mklibs.py 2006-04-28 17:24:21.000000000 +0200
+@@ -481,7 +481,7 @@
+ symbols = []
+
+ # libc.so.6 needs its soinit.o and sofini.o as well as the pic
+- if (soname == "libc.so.6" or soname == "libc.so.6.1"):
++ if (soname == "libc.so.6" or soname == "libc.so.6.1" or soname == "libc.so.0.1"):
+ # force dso_handle.os to be included, otherwise reduced libc
+ # may segfault in ptmalloc_init due to undefined weak reference
+ extra_flags = find_lib(ldlib)
More information about the Glibc-bsd-commits
mailing list