summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog56
-rw-r--r--debian/config72
-rw-r--r--debian/control10
-rw-r--r--debian/control.in2
-rwxr-xr-xdebian/fixlinks11
-rw-r--r--debian/libuclibc-dev.files10
-rw-r--r--debian/libuclibc0.files3
-rw-r--r--debian/libuclibc0.shlibs15
-rwxr-xr-xdebian/rules130
-rw-r--r--debian/uclibc-toolchain.files3
10 files changed, 205 insertions, 107 deletions
diff --git a/debian/changelog b/debian/changelog
index 35fcebfb6..3733b657c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,59 @@
+uclibc (0.9.18-1) unstable; urgency=low
+
+ * New upstream release
+ * Update to kernel-source-2.4.20
+ * Upgrade .shlib dependencies
+ * Enable IPv6 and other options (Closes: #174092)
+ * Remove build directory from ld script (Closes: #161474)
+ * Add/fix /lib/ld-uClibc.so.0 symlink
+
+ -- David Schleef <ds@schleef.org> Wed, 12 Feb 2003 12:40:38 -0800
+
+uclibc (0.9.16-6) unstable; urgency=low
+
+ * Reenable FPU and C99 math support that were accidentally
+ disabled in the move to 0.9.16. (Closes: #171359, #172686)
+ * Fix ${arch}-uclibc-xx installation directory (should be /usr/bin)
+ * Make ldd work with dh_shlibdeps (Closes: #171282, #171287)
+
+ -- David Schleef <ds@schleef.org> Wed, 11 Dec 2002 15:55:52 -0800
+
+uclibc (0.9.16-5) unstable; urgency=low
+
+ * (Attempt #2) Removed some default flags on sparc.
+
+ -- David Schleef <ds@schleef.org> Wed, 27 Nov 2002 13:56:39 -0800
+
+uclibc (0.9.16-4) unstable; urgency=low
+
+ * Removed some default flags on m68k and sparc, since they don't
+ work with the standard gcc.
+ * Stripped quotes around ARCH_CFLAGS
+
+ -- David Schleef <ds@schleef.org> Fri, 22 Nov 2002 15:15:25 -0800
+
+uclibc (0.9.16-3) unstable; urgency=low
+
+ * Got the last change wrong.
+ * Enabled alpha build.
+
+ -- David Schleef <ds@schleef.org> Thu, 21 Nov 2002 16:24:27 -0800
+
+uclibc (0.9.16-2) unstable; urgency=low
+
+ * Disable shared lib loader on m68k and sparc
+
+ -- David Schleef <ds@schleef.org> Wed, 20 Nov 2002 19:45:31 -0800
+
+uclibc (0.9.16-1) unstable; urgency=low
+
+ * New upstream release (Closes: #169650, #169547)
+ * Rewrote much of the installation code to use dh_ more
+ * Removed gasp man page link (Closes: #169648)
+ * Upstream uses new configuration method (Closes: #169513)
+
+ -- David Schleef <ds@schleef.org> Mon, 18 Nov 2002 11:32:43 -0800
+
uclibc (0.9.12-2) unstable; urgency=low
* Make sure MAS_MMU=true on m68k
diff --git a/debian/config b/debian/config
new file mode 100644
index 000000000..22711f08c
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,72 @@
+#
+# Automatically generated make config: don't edit
+#
+
+#
+# Target Architecture Features and Options
+#
+HAVE_ELF=y
+CONFIG_386=y
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+UCLIBC_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+HAS_FPU=y
+DO_C99_MATH=y
+WARNINGS="-Wall"
+KERNEL_SOURCE="/usr/src/linux"
+C_SYMBOL_PREFIX=""
+
+#
+# General Library Settings
+#
+DOPIC=y
+HAVE_SHARED=y
+BUILD_UCLIBC_LDSO=y
+LDSO_LDD_SUPPORT=y
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+MALLOC_930716=y
+HAS_SHADOW=y
+UCLIBC_HAS_REGEX=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_WCHAR=y
+# USE_OLD_VFPRINTF is not set
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib"
+DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
+SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
+DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
+
+#
+# uClibc hacking options
+#
+# DODEBUG is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/debian/control b/debian/control
index cd0fd26f9..2ea715022 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: uclibc
Section: devel
Priority: optional
Maintainer: David Schleef <ds@schleef.org>
-Build-Depends: debhelper, bzip2, kernel-source-2.4.18
-Standards-Version: 3.5.6
+Build-Depends: debhelper, bzip2, kernel-source-2.4.20
+Standards-Version: 3.5.8
Package: libuclibc-dev
Section: devel
-Architecture: arm i386 m68k mips mipsel powerpc sh sparc
+Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
Depends: libuclibc0 (= ${Source-Version})
Description: A small implementation of the C library
uClibc is an implementation of the standard C library that is
@@ -17,7 +17,7 @@ Description: A small implementation of the C library
Package: libuclibc0
Section: libs
-Architecture: arm i386 m68k mips mipsel powerpc sh sparc
+Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
Depends:
Description: A small implementation of the C library
uClibc is an implementation of the standard C library that is
@@ -30,7 +30,7 @@ Description: A small implementation of the C library
Package: uclibc-toolchain
Section: devel
-Architecture: arm i386 m68k mips mipsel powerpc sh sparc
+Architecture: alpha arm i386 m68k mips mipsel powerpc sh sparc
Depends: gcc|c-compiler, binutils, ${shlibs:Depends}
Recommends: libuclibc-dev
Conflicts: uclibc-gcc
diff --git a/debian/control.in b/debian/control.in
index f61f6b99a..ee46a686c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: David Schleef <ds@schleef.org>
Build-Depends: debhelper, bzip2, _KERNEL_
-Standards-Version: 3.5.6
+Standards-Version: 3.5.8
Package: libuclibc-dev_TARGET_
Section: devel
diff --git a/debian/fixlinks b/debian/fixlinks
index 39f719b12..110a5e313 100755
--- a/debian/fixlinks
+++ b/debian/fixlinks
@@ -2,10 +2,11 @@
# vi: set ts=4:
-@LINKS=`find . -type l|xargs ls -l`;
+@LINKS=`find . -type l|LC_ALL=C xargs ls -l`;
#print @LINKS;
+#$debug = 1;
while($_ = shift @LINKS){
chomp;
@@ -34,7 +35,7 @@ while($_ = shift @LINKS){
pop(@newcomponents);
while($comp = shift @linkcomponents){
- #print "path: ",join(':',@newcomponents)," -- $comp -- ", join(':',@linkcomponents),"\n";
+ $debug && print "path: ",join(':',@newcomponents)," -- $comp -- ", join(':',@linkcomponents),"\n";
if($comp eq ""){
# ignore
@@ -57,8 +58,8 @@ while($_ = shift @LINKS){
#print "to ",join('/',@newcomponents),"\n";
if($newcomponents[0] eq $pathcomponents[0]){
- #print $newcomponents[0],", ",$pathcomponents[0];
- #print "should be relative\n";
+ $debug && print $newcomponents[0],", ",$pathcomponents[0];
+ $debug && print "should be relative\n";
while($newcomponents[0] eq $pathcomponents[0]){
shift(@newcomponents);
shift(@pathcomponents);
@@ -68,7 +69,7 @@ while($_ = shift @LINKS){
unshift(@newcomponents,"..");
}
}else{
- #print "should be absolute\n";
+ $debug && print "should be absolute\n";
unshift(@newcomponents,"");
}
$newlink=join('/',@newcomponents);
diff --git a/debian/libuclibc-dev.files b/debian/libuclibc-dev.files
new file mode 100644
index 000000000..a1311bf1d
--- /dev/null
+++ b/debian/libuclibc-dev.files
@@ -0,0 +1,10 @@
+usr/*-linux-uclibc/include
+usr/*-linux-uclibc/lib/*.a
+usr/*-linux-uclibc/lib/libcrypt.so
+usr/*-linux-uclibc/lib/libdl.so
+usr/*-linux-uclibc/lib/libm.so
+usr/*-linux-uclibc/lib/libpthread.so
+usr/*-linux-uclibc/lib/libresolv.so
+usr/*-linux-uclibc/lib/libc.so
+usr/*-linux-uclibc/lib/libutil.so
+usr/*-linux-uclibc/lib/*.o
diff --git a/debian/libuclibc0.files b/debian/libuclibc0.files
new file mode 100644
index 000000000..7698dcc2d
--- /dev/null
+++ b/debian/libuclibc0.files
@@ -0,0 +1,3 @@
+lib/*
+usr/*-linux-uclibc/lib/*.so.*
+usr/*-linux-uclibc/lib/*-*.so
diff --git a/debian/libuclibc0.shlibs b/debian/libuclibc0.shlibs
index e7319f854..1f1f5467c 100644
--- a/debian/libuclibc0.shlibs
+++ b/debian/libuclibc0.shlibs
@@ -1,7 +1,8 @@
-libc 0 libuclibc0 (>> 0.9.10-0)
-libm 0 libuclibc0 (>> 0.9.10-0)
-ld-uClibc 0 libuclibc0 (>> 0.9.10-0)
-libdl 0 libuclibc0 (>> 0.9.10-0)
-libcrypt 0 libuclibc0 (>> 0.9.10-0)
-libutil 0 libuclibc0 (>> 0.9.10-0)
-libresolv 0 libuclibc0 (>> 0.9.10-0)
+libc 0 libuclibc0 (>= 0.9.17-1)
+libm 0 libuclibc0 (>= 0.9.17-1)
+ld-uClibc 0 libuclibc0 (>= 0.9.17-1)
+libdl 0 libuclibc0 (>= 0.9.17-1)
+libcrypt 0 libuclibc0 (>= 0.9.17-1)
+libutil 0 libuclibc0 (>= 0.9.17-1)
+libresolv 0 libuclibc0 (>= 0.9.17-1)
+libpthread 0 libpthread0 (>= 0.9.17-1)
diff --git a/debian/rules b/debian/rules
index 7595b8ba8..d0d001e49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,18 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=1
+export DH_COMPAT=3
#include version
major=$(shell grep '^MAJOR_VERSION' Rules.mak|sed 's/.*=//')
minor=$(shell grep '^MINOR_VERSION' Rules.mak|sed 's/.*=//')
version:=$(strip $(major)).$(strip $(minor))
-kernel_version=2.4.18
+kernel_version=2.4.20
kernel_source=kernel-source-$(kernel_version)
+builddir=$(shell pwd)
+
target=$(DEB_HOST_GNU_CPU)
#target=arm
@@ -34,12 +36,6 @@ ifneq ($(target),$(DEB_HOST_GNU_CPU))
target_suffix=-$(target)
endif
-ifneq ($(target),mipsel)
-config_orig = extra/Configs/Config.$(target)
-else
-config_orig = extra/Configs/Config.mips
-endif
-
ifneq ($(target),$(DEB_HOST_GNU_CPU))
cross_options = --cross="$(target)-linux-"
else
@@ -52,7 +48,7 @@ p_gcc=uclibc$(target_suffix)-toolchain
debian/control: debian/control.in debian/rules
sed -e s/_TARGET_/$(target_suffix)/ \
- -e "s/_ARCHS_/arm i386 m68k mips mipsel powerpc sh sparc/" \
+ -e "s/_ARCHS_/alpha arm i386 m68k mips mipsel powerpc sh sparc/" \
-e "s/_KERNEL_/$(kernel_source)/" \
debian/control.in >debian/control
@@ -82,55 +78,21 @@ build-stamp: debian/control
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
echo '#define LINUX_VERSION_CODE KERNEL_VERSION($(shell echo $(kernel_version) | sed s/\\./,/g))'; \
) >$(kernel_source)/include/linux/version.h
-
- extra/Configs/uClibc_config_fix.pl \
- --arch=$(target) \
- $(cross_options) \
- --devel_prefix=/usr/$(target)-linux-uclibc \
- --system_devel_prefix=/usr \
- --kernel_dir=`pwd`/$(kernel_source) \
- --large_file=true \
- --rpc_support=true \
- --c99_math=true \
- --threads=true \
- --long_long=true \
- --float=true \
- --shadow=true \
- --mmu=true \
- --ldso_path="/lib" \
- --shared_support=$(shared_libs_true) \
- --file=$(config_orig) \
- >Config
-
-ifeq (yes,no)
- echo '#Debian configuration overrides' >>Config
-ifneq ($(target),$(DEB_HOST_GNU_CPU))
- echo 'TARGET_ARCH = $(target)' >>Config
- echo 'CROSS = $(target)-linux-' >>Config
-else
- echo 'CROSS = ' >>Config
-endif
- echo 'DOPIC = true' >>Config
- echo 'SYSTEM_DEVEL_PREFIX = /usr' >>Config
- echo 'DEVEL_PREFIX = /usr/$$(TARGET_ARCH)-linux-uclibc' >>Config
- echo 'SHARED_LIB_LOADER_PATH = /lib' >>Config
- #echo 'TARGET_PREFIX = /' >>Config
-ifeq ($(with_shared_libs),n)
- echo 'HAVE_SHARED = false' >>Config
-else
- echo 'HAVE_SHARED = true' >>Config
-endif
- echo 'KERNEL_SOURCE = '`pwd`/$(kernel_source) >>Config
- echo 'HAS_MMU = true' >>Config
- echo 'HAS_FLOATING_POINT = true' >>Config
- echo 'DO_C99_MATH = true' >>Config
- echo 'DODEBUG = false' >>Config
- echo 'INCLUDE_THREADS = true' >>Config
+
+ cp debian/config .config
+ echo CONFIG_386=y >>.config
+ifeq ($(findstring $(target),alpha m68k sparc),$(target))
+ echo BUILD_UCLIBC_LDSO=n >>.config
endif
+ echo SHARED_LIB_LOADER_PATH=\"/lib\" >>.config
+ echo KERNEL_SOURCE=\"$(builddir)/$(kernel_source)\" >>.config
+ echo 'DEVEL_TOOL_PREFIX="$$(DEVEL_PREFIX)"' >>.config
+ echo 'SYSTEM_DEVEL_PREFIX="/usr"' >>.config
+ yes '' | make oldconfig
mkdir -p lib
- $(MAKE)
+ $(MAKE) TARGET_ARCH=$(target)
touch build-stamp
@@ -139,14 +101,12 @@ clean: debian/control
dh_testroot
rm -f build-stamp
- rm -f debian/$(p_dev)
-
rm -rf kernel-source-*
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ -$(MAKE) distclean
- -rm Config
+ -rm -f Config
dh_clean
@@ -156,44 +116,38 @@ install: build debian/control
dh_clean -k
dh_installdirs
- -rm debian/$(p_dev)
- ln -s tmp debian/$(p_dev)
+ -rm debian/tmp
+ -mkdir debian/tmp
+ #ln -s tmp debian/tmp
# Add here commands to install the package into debian/tmp.
- $(MAKE) install_dev PREFIX=`pwd`/debian/$(p_dev)
- $(MAKE) install_runtime PREFIX=`pwd`/debian/$(p_lib)
- $(MAKE) install_toolchain PREFIX=`pwd`/debian/$(p_gcc)
- $(MAKE) install_utils PREFIX=`pwd`/debian/$(p_gcc)
+ $(MAKE) install PREFIX=`pwd`/debian/tmp
+ $(MAKE) install_runtime PREFIX=`pwd`/debian/tmp
- install -d debian/$(p_gcc)/usr/share/man/man1
+ install -d debian/tmp/usr/share/man/man1
install -m 644 debian/uclibc-gcc.1 \
- debian/$(p_gcc)/usr/share/man/man1/$(target)-uclibc-gcc.1
- (cd debian/$(p_gcc)/usr/share/man/man1; \
+ debian/tmp/usr/share/man/man1/$(target)-uclibc-gcc.1
+ (cd debian/tmp/usr/share/man/man1; \
ln -sf $(target)-uclibc-gcc.1.gz $(target)-uclibc-cc.1.gz; \
ln -sf $(target)-uclibc-gcc.1.gz $(target)-uclibc-ld.1.gz; \
- for x in addr2line ar as cpp gasp nm objcopy objdump ranlib \
+ for x in addr2line ar as cpp nm objcopy objdump ranlib \
size strings strip;do \
ln -sf $$x.1.gz $(target)-uclibc-$$x.1.gz;done)
- install -d debian/$(p_lib)/usr/share/man/man1
+ install -d debian/tmp/usr/share/man/man1
install -m 644 debian/uclibc-ldd.1 \
- debian/$(p_lib)/usr/share/man/man1/$(target)-uclibc-ldd.1
+ debian/tmp/usr/share/man/man1/$(target)-uclibc-ldd.1
install -m 644 debian/uclibc-ldconfig.1 \
- debian/$(p_lib)/usr/share/man/man1/$(target)-uclibc-ldconfig.1
+ debian/tmp/usr/share/man/man1/$(target)-uclibc-ldconfig.1
install -m 644 debian/uclibc-readelf.1 \
- debian/$(p_lib)/usr/share/man/man1/$(target)-uclibc-readelf.1
+ debian/tmp/usr/share/man/man1/$(target)-uclibc-readelf.1
+
+ mkdir debian/tmp/lib/
+ cd debian/tmp/lib && ln -sf /usr/$(target)-linux-uclibc/lib/ld-uClibc.so.0 .
- (cd debian/$(p_dev); find . -name '.*' -exec rm -f '{}' ';')
- (cd debian/$(p_lib); find . -name '.*' -exec rm -f '{}' ';')
- (cd debian/$(p_gcc); find . -name '.*' -exec rm -f '{}' ';')
+ cd debian/tmp && ../fixlinks
-ifeq ($(with_shared_libs),y)
-ifeq ($(target),$(DEB_HOST_GNU_CPU))
- mkdir -p debian/$(p_lib)/lib/
- ln -sf /usr/$(target)-linux-uclibc/lib/ld-uClibc.so.0 \
- debian/$(p_lib)/lib/ld-uClibc.so.0
-endif
-endif
+ (cd debian/tmp; find . -name '.*' -exec rm -f '{}' ';')
# Build architecture-independent files here.
binary-indep:
@@ -204,6 +158,7 @@ binary-arch: build install
dh_testdir
dh_testroot
+ dh_movefiles
# dh_installdebconf
dh_installdocs
dh_installexamples
@@ -217,9 +172,6 @@ binary-arch: build install
# dh_undocumented
dh_installchangelogs
dh_link
- cd debian/libuclibc0 && ../fixlinks
- cd debian/libuclibc-dev && ../fixlinks
- cd debian/uclibc-toolchain && ../fixlinks
dh_strip
dh_compress
dh_fixperms -Xld-uClibc
@@ -228,11 +180,11 @@ binary-arch: build install
# dh_makeshlibs
dh_installdeb
# dh_perl
-ifeq ($(target),$(DEB_HOST_GNU_CPU))
- dh_shlibdeps --exclude=ld_uclibc -ldebian/$(p_lib)/usr/$(target)-linux-uclibc/lib
-else
+#ifeq ($(target),$(DEB_HOST_GNU_CPU))
+# dh_shlibdeps --exclude=ld_uclibc -ldebian/$(p_lib)/usr/$(target)-linux-uclibc/lib
+#else
dh_shlibdeps --exclude=lib
-endif
+#endif
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/uclibc-toolchain.files b/debian/uclibc-toolchain.files
new file mode 100644
index 000000000..b542017e1
--- /dev/null
+++ b/debian/uclibc-toolchain.files
@@ -0,0 +1,3 @@
+usr/*-linux-uclibc/bin/*
+usr/bin/*
+usr/share/man/man1/*