Author: aurel32
Date: 2006-02-17 22:30:20 +0000 (Fri, 17 Feb 2006)
New Revision: 1186
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/script.in/kernelcheck.sh
Log:
Put the Debian architecture name in the script at build time instead
of using 'dpkg --print-architecture'. Thanks to Florent Bayle for
the idea. (Closes: #325802, #328088, #339482)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-17 19:52:49 UTC (rev
1185)
+++ glibc-package/trunk/debian/changelog 2006-02-17 22:30:20 UTC (rev
1186)
@@ -35,7 +35,9 @@
amd64 and move files after the call to 'make install'. This fixes
the wrong dynamic linker path for libc objects. (Closes: #325226)
* Use sed and test in /etc/init.d/glibc.sh to compare kernel versions.
- Partly fixes bug #325263.
+ Put the Debian architecture name in the script at build time instead
+ of using 'dpkg --print-architecture'. Thanks to Florent Bayle for
+ the idea. (Closes: #325802, #328088, #339482)
-- Clint Adams <[EMAIL PROTECTED]> Sun, 12 Feb 2006 11:04:38 -0500
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-17 19:52:49 UTC
(rev 1185)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-17 22:30:20 UTC
(rev 1186)
@@ -28,7 +28,7 @@
esac
sed -e "/KERNEL_VERSION_CHECK/r debian/script.in/kernelcheck.sh" \
debian/local/etc_init.d/glibc.sh | \
- sed -e "s/EXIT_CHECK/sleep 5/" > debian/glibc.sh.generated
+ sed -e "s/EXIT_CHECK/sleep 5/" -e
"s/DEB_HOST_ARCH/$(DEB_HOST_ARCH)/" > debian/glibc.sh.generated
install --mode=0755 debian/glibc.sh.generated
debian/$(curpass)/etc/init.d/glibc.sh
# dh_installmanpages thinks that .so is a language.
install --mode=0644 debian/local/manpages/ld.so.8
debian/$(curpass)/usr/share/man/man8/ld.so.8
Modified: glibc-package/trunk/debian/script.in/kernelcheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/kernelcheck.sh 2006-02-17 19:52:49 UTC
(rev 1185)
+++ glibc-package/trunk/debian/script.in/kernelcheck.sh 2006-02-17 22:30:20 UTC
(rev 1186)
@@ -128,7 +128,7 @@
fi
if [ "$realarch" = mips ] \
- && [ "`dpkg --print-architecture`" = mips ]
+ && [ DEB_HOST_ARCH = mips ]
then
# MIPS (but not mipsel) require a kernel update for the msq fixes.
if kernel_compare_versions "$kernel_ver" lt 2.4.22
@@ -142,7 +142,7 @@
# amd64 requires 2.6 kernel because we drop to support linuxthreads
if [ "$realarch" = x86_64 ] \
- && [ "`dpkg --print-architecture`" = amd64 ]
+ && [ DEB_HOST_ARCH = amd64 ]
then
if kernel_compare_versions "$kernel_ver" lt 2.6.0
then
@@ -156,7 +156,7 @@
# arm requires 2.4 kernel to avoid "obsolete calling standard" problem
# with sys_llseek
if [ "$realarch" = arm ] \
- && [ "`dpkg --print-architecture`" = arm ]
+ && [ DEB_HOST_ARCH = arm ]
then
if kernel_compare_versions "$kernel_ver" lt 2.4.0
then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
