tags 247430 patch thanks Here's a patch for this bug against CVS HEAD. You'll need to run 'debian/rules debian/control' after applying it, of course. It creates libnss-files-udeb, makes the various libc-udeb packages depend on libnss-dns-udeb and libnss-files-udeb, and drops libnss_dns.so and libnss_files.so from libc-udeb.
Index: debian/.cvsignore =================================================================== RCS file: /cvs/glibc/glibc-package/debian/.cvsignore,v retrieving revision 1.2 diff -p -u -r1.2 .cvsignore --- debian/.cvsignore 28 Oct 2003 22:56:54 -0000 1.2 +++ debian/.cvsignore 12 May 2004 17:05:57 -0000 @@ -1,6 +1,8 @@ control files libc* +libnss-dns-udeb* +libnss-files-udeb* glibc-doc* locales* tmp-* Index: debian/rules =================================================================== RCS file: /cvs/glibc/glibc-package/debian/rules,v retrieving revision 1.22 diff -p -u -r1.22 rules --- debian/rules 18 Apr 2004 07:12:38 -0000 1.22 +++ debian/rules 12 May 2004 17:05:57 -0000 @@ -114,7 +114,7 @@ curpass = $(filter-out %_,$(subst _,_ ,$ DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales -DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb +DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb # Generic kernel version check define kernel_check Index: debian/control.in/libc =================================================================== RCS file: /cvs/glibc/glibc-package/debian/control.in/libc,v retrieving revision 1.9 diff -p -u -r1.9 libc --- debian/control.in/libc 18 Apr 2004 07:12:38 -0000 1.9 +++ debian/control.in/libc 12 May 2004 17:05:58 -0000 @@ -61,11 +61,12 @@ Architecture: @archs@ Section: debian-installer Priority: extra Provides: @libc@, libc-udeb, ${locale:Depends} +Depends: libnss-dns-udeb, libnss-files-udeb Description: GNU C Library: Shared libraries - udeb Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C library and the standard math library, as well as many others. . - This package contains a minimal set of libraries needed for the debian + This package contains a minimal set of libraries needed for the Debian installer. Do not install it on a normal system. Index: debian/control.in/libnss-dns-udeb =================================================================== RCS file: /cvs/glibc/glibc-package/debian/control.in/libnss-dns-udeb,v retrieving revision 1.1 diff -p -u -r1.1 libnss-dns-udeb --- debian/control.in/libnss-dns-udeb 18 Apr 2004 07:12:38 -0000 1.1 +++ debian/control.in/libnss-dns-udeb 12 May 2004 17:05:58 -0000 @@ -8,6 +8,6 @@ Description: GNU C Library: NSS helper f the system. This package includes shared versions of the standard C library and the standard math library, as well as many others. . - This package contains dns nss helper needed for the debian installer. Do not - install it on a normal system. + This package contains the DNS NSS helper needed for the Debian installer. + Do not install it on a normal system. Index: debian/control.in/libnss-files-udeb =================================================================== RCS file: debian/control.in/libnss-files-udeb diff -N debian/control.in/libnss-files-udeb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ debian/control.in/libnss-files-udeb 12 May 2004 17:05:58 -0000 @@ -0,0 +1,13 @@ +Package: libnss-files-udeb +XC-Package-Type: udeb +Architecture: any +Section: debian-installer +Priority: extra +Description: GNU C Library: NSS helper for files + Contains the standard libraries that are used by nearly all programs on + the system. This package includes shared versions of the standard C library + and the standard math library, as well as many others. + . + This package contains the files NSS helper needed for the Debian installer. + Do not install it on a normal system. + Index: debian/debhelper.in/libc-udeb.install =================================================================== RCS file: /cvs/glibc/glibc-package/debian/debhelper.in/libc-udeb.install,v retrieving revision 1.3 diff -p -u -r1.3 libc-udeb.install --- debian/debhelper.in/libc-udeb.install 5 May 2004 16:17:28 -0000 1.3 +++ debian/debhelper.in/libc-udeb.install 12 May 2004 17:05:58 -0000 @@ -4,8 +4,6 @@ debian/tmp-libc/lib/libm-*.so* lib debian/tmp-libc/lib/libm.so* lib debian/tmp-libc/lib/libdl*.so* lib debian/tmp-libc/lib/libresolv*.so* lib -debian/tmp-libc/lib/libnss_dns*.so* lib -debian/tmp-libc/lib/libnss_files.so* lib debian/tmp-libc/lib/libc-*.so* lib debian/tmp-libc/lib/libc.so* lib # FIXME: This should be with_threads arch's only. Index: debian/debhelper.in/libnss-files-udeb.install =================================================================== RCS file: debian/debhelper.in/libnss-files-udeb.install diff -N debian/debhelper.in/libnss-files-udeb.install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ debian/debhelper.in/libnss-files-udeb.install 12 May 2004 17:05:58 -0000 @@ -0,0 +1,3 @@ +# FIXME: someday we may need to handle installing into non-lib. +debian/tmp-libc/lib/libnss_files*.so* lib + Index: debian/rules.d/control.mk =================================================================== RCS file: /cvs/glibc/glibc-package/debian/rules.d/control.mk,v retrieving revision 1.10 diff -p -u -r1.10 control.mk --- debian/rules.d/control.mk 18 Apr 2004 07:12:38 -0000 1.10 +++ debian/rules.d/control.mk 12 May 2004 17:05:58 -0000 @@ -25,7 +25,8 @@ debian/control: debian/control.in/main $ cat debian/control.in/sparc64 >> [EMAIL PROTECTED] cat debian/control.in/s390x >> [EMAIL PROTECTED] cat debian/control.in/opt >> [EMAIL PROTECTED] - cat debian/control.in/libnss-dns-udeb >> [EMAIL PROTECTED] + cat debian/control.in/libnss-dns-udeb >> [EMAIL PROTECTED] + cat debian/control.in/libnss-files-udeb >> [EMAIL PROTECTED] sed -e '[EMAIL PROTECTED]@%$(libc)%g;[EMAIL PROTECTED]@%glibc%g' \ -e '[EMAIL PROTECTED]@%$(threads_archs)%g' < [EMAIL PROTECTED] > $@ rm [EMAIL PROTECTED] Thanks, -- Colin Watson [EMAIL PROTECTED] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]