Package: libuclibc0
Followup-For: Bug #341441
Hi *!
Attached is a patch to bring the debian/ directory up to speed with
regards to uclibc 0.9.28
changelog | 10 +++++++++
compat | 1
config | 53 +++++++++++++++++++++++++++++++++++++---------------
control.in | 2 -
libuclibc-dev.files | 1
rules | 40 ++++++++++++++++++++-------------------
6 files changed, 72 insertions(+), 35 deletions(-)
also there is a small addition to extra/scripts/fix_includes.sh needed
to recognize current kernel-headers:
--- uclibc-0.9.28.unmodified/extra/scripts/fix_includes.sh 2005-08-17
22:49:41.000000000 +0000
+++ uclibc-0.9.28/extra/scripts/fix_includes.sh 2006-01-30 14:20:18.000000000
+0000
@@ -163,6 +165,10 @@
else
# No guessing required.....
ln -fs $KERNEL_SOURCE/include/asm include/asm
+# needed for 2.6.13+
+if [ "$TARGET_ARCH" = 'i386' ] && [ -e $KERNEL_SOURCE/include/asm-i486 ] ; then
+ln -fs $KERNEL_SOURCE/include/asm-i486 include/asm-i486
+fi
if [ -e $KERNEL_SOURCE/include/asm-$TARGET_ARCH ] ; then
ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm-$TARGET_ARCH
fi
Regards, David
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-3+suspend2.2-p4-1
Locale: LANG=C, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
diff -urN uclibc-0.9.27/debian/changelog uclibc-0.9.28/debian/changelog
--- uclibc-0.9.27/debian/changelog 2005-12-26 23:07:31.000000000 +0000
+++ uclibc-0.9.28/debian/changelog 2006-01-30 15:35:47.000000000 +0000
@@ -1,3 +1,13 @@
+uclibc (0.9.28-0edvbus1) unstable; urgency=low
+
+ * new upstream
+ * fixed fix_includes.sh to add asm-i486
+ * use debhelper compat = 5
+ * add librt.so symlink to -dev package
+ * updated debian/config and fixed passed parameters in debian/rules
+
+ -- David Schmitt <[EMAIL PROTECTED]> Mon, 30 Jan 2006 15:35:15 +0000
+
uclibc (0.9.27-0edvbus1) unstable; urgency=low
* replaced uclibc-linux with linux-uclibc for uclibc-toolchain
diff -urN uclibc-0.9.27/debian/compat uclibc-0.9.28/debian/compat
--- uclibc-0.9.27/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ uclibc-0.9.28/debian/compat 2006-01-30 14:41:32.000000000 +0000
@@ -0,0 +1 @@
+5
diff -urN uclibc-0.9.27/debian/config uclibc-0.9.28/debian/config
--- uclibc-0.9.27/debian/config 2005-12-26 22:54:45.000000000 +0000
+++ uclibc-0.9.28/debian/config 2006-01-30 15:16:09.000000000 +0000
@@ -3,47 +3,56 @@
#
# TARGET_alpha is not set
# TARGET_arm is not set
+# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
+# TARGET_frv is not set
# TARGET_h8300 is not set
-# TARGET_i386=y
+#TARGET_i386=y
# TARGET_i960 is not set
# TARGET_m68k is not set
# TARGET_microblaze is not set
# TARGET_mips is not set
-#TARGET_powerpc=y
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
# TARGET_sh is not set
+# TARGET_sh64 is not set
# TARGET_sparc is not set
# TARGET_v850 is not set
+# TARGET_x86_64 is not set
#
# Target Architecture Features and Options
#
HAVE_ELF=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
#TARGET_ARCH="i386"
# CONFIG_GENERIC_386 is not set
-#CONFIG_386=y
-# CONFIG_486 is not set
+# CONFIG_386 is not set
+CONFIG_486=y
# CONFIG_586 is not set
# CONFIG_586MMX is not set
# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
# CONFIG_PENTIUMIII is not set
# CONFIG_PENTIUM4 is not set
# CONFIG_K6 is not set
# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
# CONFIG_CRUSOE is not set
# CONFIG_WINCHIPC6 is not set
# CONFIG_WINCHIP2 is not set
# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
ARCH_LITTLE_ENDIAN=y
# ARCH_BIG_ENDIAN is not set
# ARCH_HAS_NO_MMU is not set
-UCLIBC_HAS_MMU=y
+ARCH_HAS_MMU=y
UCLIBC_HAS_FLOATS=y
HAS_FPU=y
DO_C99_MATH=y
-WARNINGS="-Wall"
-KERNEL_SOURCE="/home/ds/debian/uclibc/uclibc-0.9.26/kernel-source-2.4.22"
+#KERNEL_SOURCE="/home/david/uclibc/uclibc-0.9.28/kernel"
C_SYMBOL_PREFIX=""
HAVE_DOT_CONFIG=y
@@ -55,16 +64,20 @@
# HAVE_NO_SHARED is not set
HAVE_SHARED=y
# ARCH_HAS_NO_LDSO is not set
-BUILD_UCLIBC_LDSO=y
-# UCLIBC_PIE_SUPPORT is not set
+#BUILD_UCLIBC_LDSO=y
+FORCE_SHAREABLE_TEXT_SEGMENTS=y
LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+LDSO_PRELOAD_FILE_SUPPORT=y
+LDSO_BASE_FILENAME="ld-uClibc.so"
+LDSO_RUNPATH=y
+# DL_FINI_CRT_COMPAT is not set
UCLIBC_CTOR_DTOR=y
-# UCLIBC_PROPOLICE is not set
-# UCLIBC_PROFILING is not set
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
# PTHREADS_DEBUG_SUPPORT is not set
UCLIBC_HAS_LFS=y
+UCLIBC_STATIC_LDCONFIG=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
MALLOC_STANDARD=y
@@ -89,6 +102,8 @@
#
# String and Stdio Support
#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
UCLIBC_HAS_CTYPE_UNSAFE=y
@@ -115,6 +130,7 @@
UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
UCLIBC_HAS_STDIO_GETC_MACRO=y
UCLIBC_HAS_STDIO_PUTC_MACRO=y
UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
@@ -126,7 +142,6 @@
# UCLIBC_HAS_SYS_ERRLIST is not set
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GETTEXT_AWARENESS=y
UCLIBC_HAS_GNU_GETOPT=y
#
@@ -140,15 +155,23 @@
#
# Library Installation Options
#
-SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)lib"
-RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
-DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
+#SHARED_LIB_LOADER_PREFIX="/lib"
+#RUNTIME_PREFIX="/"
+#DEVEL_PREFIX="/usr/i486-linux-uclibc"
+
+#
+# uClibc security related options
+#
+# UCLIBC_SECURITY is not set
#
# uClibc development/debugging options
#
+CROSS_COMPILER_PREFIX=""
# DODEBUG is not set
+# DODEBUG_PT is not set
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
+WARNINGS="-Wall"
# UCLIBC_MJN3_ONLY is not set
diff -urN uclibc-0.9.27/debian/control.in uclibc-0.9.28/debian/control.in
--- uclibc-0.9.27/debian/control.in 2005-12-26 22:54:45.000000000 +0000
+++ uclibc-0.9.28/debian/control.in 2006-01-30 15:51:25.000000000 +0000
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: David Schleef <[EMAIL PROTECTED]>
-Build-Depends: debhelper, bzip2
+Build-Depends: debhelper (>= 5), bzip2
Standards-Version: 3.5.8
Package: libuclibc-dev_TARGET_
diff -urN uclibc-0.9.27/debian/libuclibc-dev.files
uclibc-0.9.28/debian/libuclibc-dev.files
--- uclibc-0.9.27/debian/libuclibc-dev.files 2005-12-26 22:54:45.000000000
+0000
+++ uclibc-0.9.28/debian/libuclibc-dev.files 2006-01-30 14:59:07.000000000
+0000
@@ -8,5 +8,6 @@
usr/*-linux-uclibc/lib/libpthread.so
usr/*-linux-uclibc/lib/libresolv.so
usr/*-linux-uclibc/lib/libc.so
+usr/*-linux-uclibc/lib/librt.so
usr/*-linux-uclibc/lib/libutil.so
usr/*-linux-uclibc/lib/*.o
diff -urN uclibc-0.9.27/debian/rules uclibc-0.9.28/debian/rules
--- uclibc-0.9.27/debian/rules 2005-12-26 23:27:03.000000000 +0000
+++ uclibc-0.9.28/debian/rules 2006-01-30 15:39:43.000000000 +0000
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
#include version
major=$(shell grep '^MAJOR_VERSION' Rules.mak|sed 's/.*=//')
minor=$(shell grep '^MINOR_VERSION' Rules.mak|sed 's/.*=//')
@@ -17,7 +14,12 @@
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
target=$(DEB_HOST_GNU_CPU)
-#target=arm
+# used for new (0.9.28) uclibc config
+ifeq ($(target),i486)
+target_arch=i386
+else
+target_arch=$(target)
+endif
with_shared_libs=y
#ifeq ($(target),powerpc)
@@ -60,21 +62,22 @@
>types.h.tmp && mv types.h.tmp kernel/include/linux/types.h
cp debian/config .config
- echo TARGET_$(target)=y >>.config
- echo CONFIG_ARCH=$(target) >>.config
- echo CONFIG_386=y >>.config
+ echo TARGET_$(target_arch)=y >>.config
+ echo TARGET_ARCH=$(target_arch) >>.config
ifeq ($(findstring $(target),alpha m68k sparc),$(target))
echo BUILD_UCLIBC_LDSO=n >>.config
+else
+ echo BUILD_UCLIBC_LDSO=y >>.config
endif
- echo UCLIBC_PROFILING=n >>.config
- echo SHARED_LIB_LOADER_PATH=\"/lib\" >>.config
+ #echo UCLIBC_PROFILING=n >>.config
+ echo SHARED_LIB_LOADER_PREFIX=\"/lib/$(target)-linux-uclibc\" >>.config
echo KERNEL_SOURCE=\"$(builddir)/kernel\" >>.config
- echo 'RUNTIME_PREFIX="/usr/$(DEB_HOST_GNU_CPU)-linux-uclibc/"' >>.config
+ echo 'RUNTIME_PREFIX="/"' >>.config
echo 'DEVEL_PREFIX="/usr/$(DEB_HOST_GNU_CPU)-linux-uclibc"' >>.config
- echo 'DEVEL_TOOL_PREFIX="$$(DEVEL_PREFIX)"' >>.config
- echo 'SYSTEM_DEVEL_PREFIX="/usr"' >>.config
+ #echo 'DEVEL_TOOL_PREFIX="$$(DEVEL_PREFIX)"' >>.config
+ #echo 'SYSTEM_DEVEL_PREFIX="/usr"' >>.config
- yes '' | make oldconfig
+ #yes '' | make oldconfig
cat .config
@@ -87,7 +90,6 @@
clean: debian/control
dh_testdir
- dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
@@ -106,7 +108,6 @@
install: build debian/control
dh_testdir
- dh_testroot
dh_clean -k
dh_installdirs
@@ -151,12 +152,14 @@
install -m 644 debian/uclibc-readelf.1 \
debian/tmp/usr/share/man/man1/$(target)-linux-uclibc-readelf.1
- mkdir debian/tmp/lib/
+ mkdir -p debian/tmp/lib/
cd debian/tmp/lib && ln -sf
/usr/$(target)-linux-uclibc/lib/ld-uClibc.so.0 .
- cd debian/tmp && perl ../fixlinks
+ # newer dh_links should do everything needed
+ #cd debian/tmp && perl ../fixlinks
- (cd debian/tmp; find . -name '.*' -exec rm -f '{}' ';')
+ # Don't hide errors
+ #(cd debian/tmp; find . -name '.*' -exec rm -f '{}' ';')
# Build architecture-independent files here.
binary-indep:
@@ -165,7 +168,6 @@
binary-arch: build install
# dh_testversion
dh_testdir
- dh_testroot
dh_movefiles
# dh_installdebconf
