From 0a57ea3e181d91a03b7f84169d4bccee8cfe54af Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 15 Aug 2005 05:20:47 +0000 Subject: Patch from Faidon Liambotis to update the debian stuff --- debian/changelog | 6 ++++++ debian/config | 47 ++++++++++++++++++++++++++++++++++++++++++++--- debian/control | 10 +++++----- debian/copyright | 16 +++++++++++++++- debian/docs | 1 - debian/rules | 6 +++--- debian/uclibc.shlibs | 21 +++++++++++---------- 7 files changed, 84 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f0beae18..efff186d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +uclibc (0.9.28-1) unstable; urgency=low + + * New upstream release. + + -- Erik Andersen Sun, 14 Aug 2005 23:15:03 -0600 + uclibc (0.9.26-3) unstable; urgency=low * minor updates diff --git a/debian/config b/debian/config index 4ee9f789f..a26f997c4 100644 --- a/debian/config +++ b/debian/config @@ -3,32 +3,57 @@ # # 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 is not set # TARGET_i960 is not set # TARGET_m68k is not set # TARGET_microblaze is not set # TARGET_mips is not set +# 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 is not set TARGET_ARCH="none" # ARCH_LITTLE_ENDIAN is not set +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +# CONFIG_486 is not set +# 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_BIG_ENDIAN is not set # ARCH_HAS_NO_MMU is not set +ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" KERNEL_SOURCE="/usr/src/linux" +C_SYMBOL_PREFIX="" HAVE_DOT_CONFIG=y # @@ -40,14 +65,19 @@ DOPIC=y HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set BUILD_UCLIBC_LDSO=y -# UCLIBC_BUILD_PIE is not set +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +LDSO_RUNPATH=y +# DL_FINI_CRT_COMPAT is not set UCLIBC_CTOR_DTOR=y -# UCLIBC_HAS_SSP is not set # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_LFS=y +# UCLIBC_STATIC_LDCONFIG is not set # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y @@ -72,6 +102,8 @@ UCLIBC_HAS_FULL_RPC=y # # 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 is not set @@ -93,6 +125,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=y 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 @@ -121,11 +154,19 @@ SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" DEVEL_PREFIX="/usr/$(TARGET_ARCH)-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 --git a/debian/control b/debian/control index b6587f769..53fb7510a 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: uclibc Section: libs Priority: required Maintainer: Erik Andersen -Build-Depends: make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-source-2.4.22, sed (>= 4.0.5-4) -Standards-Version: 3.5.8 +Build-Depends: debhelper (>= 3), bzip2, texinfo, kernel-source-2.4.27, sed (>= 4.0.5-4) +Standards-Version: 3.6.1.1 Package: uclibc -Architecture: alpha arm i386 m68k mips mipsel powerpc sparc sh3 sh4 sh3eb sh4eb +Architecture: alpha arm i386 m68k mips mipsel powerpc sparc Section: base Priority: required Depends: @@ -17,12 +17,12 @@ Description: The uClibc C Library: Shared libraries systems. This package provides only the run-time libraries. Package: uclibc-dev -Architecture: alpha arm i386 m68k mips mipsel powerpc sparc sh3 sh4 sh3eb sh4eb +Architecture: alpha arm i386 m68k mips mipsel powerpc sparc Section: devel Priority: standard Depends: uclibc (= ${Source-Version}) Provides: libc-dev, libc6-dev -Recommends: c-compiler +Recommends: gcc | c-compiler Description: The uClibc C Library: Development Libraries and Header Files uClibc is an implementation of the standard C library that is much smaller than glibc, which makes it useful for embedded diff --git a/debian/copyright b/debian/copyright index f7562ade9..c6b554cf0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,5 +4,19 @@ Wed, 12 Nov 2003 19:15:30 -0700 Maintainer: Erik Andersen Copyright: +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. -LGPL +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +The full text of the LGPL can be found in +/usr/share/common-licenses/LGPL diff --git a/debian/docs b/debian/docs index 4860c7273..80e90b0dd 100644 --- a/debian/docs +++ b/debian/docs @@ -1,5 +1,4 @@ README -INSTALL TODO Changelog Changelog.full diff --git a/debian/rules b/debian/rules index 689ddc8b8..93c5f9b53 100755 --- a/debian/rules +++ b/debian/rules @@ -13,9 +13,9 @@ 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.25 -kernel_source=kernel-headers-$(kernel_version) -kernel_source_dir=linux +kernel_version=2.4.31 +kernel_source=kernel-source-$(kernel_version) +kernel_source_dir=$(kernel_source) builddir=$(shell pwd) diff --git a/debian/uclibc.shlibs b/debian/uclibc.shlibs index 4dc2e46c5..7bfbad208 100644 --- a/debian/uclibc.shlibs +++ b/debian/uclibc.shlibs @@ -1,10 +1,11 @@ -libc 0 uclibc (>= 0.9.26-1) -libm 0 uclibc (>= 0.9.26-1) -ld-uClibc 0 uclibc (>= 0.9.26-1) -libdl 0 uclibc (>= 0.9.26-1) -libcrypt 0 uclibc (>= 0.9.26-1) -libutil 0 uclibc (>= 0.9.26-1) -libresolv 0 uclibc (>= 0.9.26-1) -libnsl 0 uclibc (>= 0.9.26-1) -libthread_db 1 uclibc (>= 0.9.26-1) -libpthread 0 uclibc (>= 0.9.26-1) +libc 0 uclibc (>= 0.9.28-1) +libm 0 uclibc (>= 0.9.28-1) +ld-uClibc 0 uclibc (>= 0.9.28-1) +libdl 0 uclibc (>= 0.9.28-1) +libcrypt 0 uclibc (>= 0.9.28-1) +libutil 0 uclibc (>= 0.9.28-1) +libresolv 0 uclibc (>= 0.9.28-1) +libnsl 0 uclibc (>= 0.9.28-1) +libthread_db 1 uclibc (>= 0.9.28-1) +libpthread 0 uclibc (>= 0.9.28-1) +librt 0 uclibc (>= 0.9.28-1) -- cgit v1.2.3