Bug#158589: Updated -udeb patch
Updated -udeb patch: http://raw.no/d-i/patches/glibc-2.3.1-udeb.patch
Please, please apply this for the next upload, it is absolutely needed
for debian-installer. The patch is tested and builds cleanly on
i386/unstable.
diff -Nru glibc-2.3.1/debian/changelog glibc-2.3.1.udeb.working/debian/changelog
--- glibc-2.3.1/debian/changelog 2002-10-17 14:41:44.000000000 +0200
+++ glibc-2.3.1.udeb.working/debian/changelog 2002-10-18 00:02:38.000000000 +0200
@@ -1,3 +1,10 @@
+glibc (2.3.1-1.1) unstable; urgency=low
+
+ * NMU
+ * Add libc-udeb (closes: #158589)
+
+ -- Tollef Fog Heen <tfheen@debian.org> Fri, 18 Oct 2002 00:02:32 +0200
+
glibc (2.3.1-1) unstable; urgency=low
* This is the "twilight" release...
diff -Nru glibc-2.3.1/debian/control glibc-2.3.1.udeb.working/debian/control
--- glibc-2.3.1/debian/control 2002-10-17 14:47:43.000000000 +0200
+++ glibc-2.3.1.udeb.working/debian/control 2002-10-18 01:43:25.000000000 +0200
@@ -106,6 +106,19 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: libc-udeb
+Architecture: any
+Section: debian-installer
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data - 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.
+ Timezone data is also included.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Package: libc6.1
Architecture: alpha ia64
Section: base
diff -Nru glibc-2.3.1/debian/control.in/libc-udeb glibc-2.3.1.udeb.working/debian/control.in/libc-udeb
--- glibc-2.3.1/debian/control.in/libc-udeb 1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1.udeb.working/debian/control.in/libc-udeb 2002-10-17 23:42:46.000000000 +0200
@@ -0,0 +1,13 @@
+Package: libc-udeb
+Architecture: any
+Section: debian-installer
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data - 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.
+ Timezone data is also included.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
diff -Nru glibc-2.3.1/debian/packages.d/libc-udeb.mk glibc-2.3.1.udeb.working/debian/packages.d/libc-udeb.mk
--- glibc-2.3.1/debian/packages.d/libc-udeb.mk 1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1.udeb.working/debian/packages.d/libc-udeb.mk 2002-10-18 01:07:39.000000000 +0200
@@ -0,0 +1,39 @@
+libc-udeb: $(stamp_install) debian/control $(mkdir)/sysdeps.mk
+ $(checkroot)
+ $(debian-clean)
+ -rm -rf $(tmpdir)/$@
+
+ $(make_directory) $(tmpdir)/$@/lib
+ $(make_directory) $(tmpdir)/$@/DEBIAN
+ $(INSTALL_PROGRAM) $(install_root)/lib/ld-$(VERSION).so $(tmpdir)/$@/lib/.
+ $(INSTALL_DATA) $(install_root)/lib/lib{c,m,dl}-$(VERSION).so $(tmpdir)/$@/lib/.
+ $(INSTALL_PROGRAM) $(install_root)/lib/libc-$(VERSION).so $(tmpdir)/$@/lib/.
+
+ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
+# Why doesn't the glibc makefile install this?
+ ln -sf ld.so.1 $(tmpdir)/$@/lib/ld.so
+endif
+
+# It is safe to strip the dynamic linker though _dl_debug_state must be kept
+# in order for gdb to work.
+ifeq ($(DEB_BUILD_OPTION_STRIP),yes)
+ #ifeq ($(DEB_HOST_GNU_CPU),i386) // Let's try this for all archs
+ $(STRIP) -g -K _dl_debug_state -R .note -R .comment $(tmpdir)/$@/lib/ld-$(VERSION).so
+ #endif
+ cd $(tmpdir)/$@ && \
+ $(STRIP) --strip-unneeded -R .note -R .comment lib/lib*-$(VERSION).so
+endif
+
+ # Install the libs under their sonames.
+ set -ex; cd $(tmpdir)/$@/lib; \
+ for f in *.so; do \
+ mv $$f `readelf -W --dynamic $$f | grep SONAME | \
+ sed -e 's/.*\[//' -e 's/].*//'`; done
+
+ dpkg-gencontrol -isp -p$@ -P$(tmpdir)/$@ $(libc-udeb_control_flags) \
+ -DProvides="$(shell perl debian/debver2localesdep.pl \
+ $(DEBVERSION))" -fdebian/files~
+ dpkg-distaddfile libc-udeb_$(DEBVERSION)_$(shell dpkg-architecture -qDEB_BUILD_ARCH).udeb debian-installer required
+ chown -R root.root $(tmpdir)/$@
+ chmod -R go=rX $(tmpdir)/$@
+ dpkg --build $(tmpdir)/$@ ../libc-udeb_$(DEBVERSION)_$(shell dpkg-architecture -qDEB_BUILD_ARCH).udeb
diff -Nru glibc-2.3.1/debian/rules glibc-2.3.1.udeb.working/debian/rules
--- glibc-2.3.1/debian/rules 2002-10-17 14:39:26.000000000 +0200
+++ glibc-2.3.1.udeb.working/debian/rules 2002-10-17 23:42:46.000000000 +0200
@@ -150,7 +150,7 @@
touch $@
-arch_packages += $(libc) $(libc)-dev $(libc)-prof $(libc)-dbg \
+arch_packages += $(libc) libc-udeb $(libc)-dev $(libc)-prof $(libc)-dbg \
$(libc)-pic $(addsuffix -pkg,$(opt_packages))
indep_packages = locales $(glibc)-doc
@@ -171,6 +171,7 @@
binary-arch: $(arch_packages)
include $(package_rules)/libc.mk
+include $(package_rules)/libc-udeb.mk
include $(package_rules)/libc-dev.mk
include $(package_rules)/libc-dbg.mk
include $(package_rules)/libc-pic.mk
diff -Nru glibc-2.3.1/debian/rules.d/control.mk glibc-2.3.1.udeb.working/debian/rules.d/control.mk
--- glibc-2.3.1/debian/rules.d/control.mk 2002-10-16 06:19:05.000000000 +0200
+++ glibc-2.3.1.udeb.working/debian/rules.d/control.mk 2002-10-17 23:42:46.000000000 +0200
@@ -21,6 +21,7 @@
debian/rules.d/control.mk debian/sysdeps/depflags.pl
cat debian/control.in/main > $@T
cat debian/control.in/libc6 >> $@T
+ cat debian/control.in/libc-udeb >> $@T
cat debian/control.in/libc6.1 >> $@T
cat debian/control.in/libc0.3 >> $@T
cat debian/control.in/libc1 >> $@T
--
Tollef Fog Heen ,''`.
UNIX is user friendly, it's just picky about who its friends are : :' :
`. `'
`-
Reply to: