merge of '375e23fc245ce8133b9f6b1700490e3ff83121e7'
authorAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:04:11 +0000 (22:04 +0000)
committerAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:04:11 +0000 (22:04 +0000)
     and 'a25740693ac2e076ba730cff4951a1681ae05cce'

40 files changed:
conf/machine/include/tune-thumb.conf [new file with mode: 0644]
packages/angstrom/angstrom-version.bb
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch [new file with mode: 0644]
packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch [new file with mode: 0644]
packages/binutils/binutils-cross_2.17.50.0.8.bb [new file with mode: 0644]
packages/binutils/binutils_2.17.50.0.8.bb [new file with mode: 0644]
packages/e2fsprogs/e2fsprogs.inc
packages/expat/expat.inc
packages/expat/expat_2.0.0.bb
packages/fuse/fuse-module_2.5.3.bb
packages/fuse/fuse.inc [new file with mode: 0644]
packages/fuse/fuse_2.5.3.bb
packages/fuse/fuse_2.6.0.bb
packages/glib-2.0/glib-2.0_2.12.6.bb [new file with mode: 0644]
packages/glib-2.0/glib.inc [new file with mode: 0644]
packages/glibc/glibc_2.5.bb
packages/gmp/gmp.inc
packages/granule/granule.inc [new file with mode: 0644]
packages/granule/granule_1.2.2.bb
packages/granule/granule_cvs.bb [new file with mode: 0644]
packages/libgcrypt/libgcrypt_1.2.3.bb
packages/pango/pango.inc [new file with mode: 0644]
packages/pango/pango_1.15.2.bb [new file with mode: 0644]
packages/subversion/subversion_1.4.0.bb
packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty [new file with mode: 0644]
packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config [new file with mode: 0644]
packages/uclibc/uclibc-cvs/efika/.mtn2git_empty [new file with mode: 0644]
packages/uclibc/uclibc-cvs/efika/uClibc.config [new file with mode: 0644]
packages/uclibc/uclibc-cvs/error_print_progname.patch [new file with mode: 0644]
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_svn.bb
packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
removal.txt

diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf
new file mode 100644 (file)
index 0000000..2a12443
--- /dev/null
@@ -0,0 +1,32 @@
+#tune file for thumb instructions
+
+ARM_INSTRUCTION_SET ?= "arm"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK ?= "no"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
+
+#    Compiler and linker options for application code and kernel code.  These
+#    options ensure that the compiler has the correct settings for the selected
+#    instruction set and interworking.
+ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+
+#
+TARGET_CC_ARCH +=  "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
+TARGET_CC_KERNEL_ARCH  += "-mno-thumb"
+
index e654511..2488255 100644 (file)
@@ -1,6 +1,7 @@
 PV = "${DISTRO_VERSION}"
 
 PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_compile() {
        mkdir -p ${D}${sysconfdir}
index 2c9008c..c73eb80 100644 (file)
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache License, Version 2.0"
 
-PR = "r1"
+PR = "r2"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
@@ -21,5 +21,5 @@ do_configure() {
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+       autotools_stage_all
 }
index 6374949..2016ca0 100644 (file)
@@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library"
 SECTION = "libs"
 LICENSE = "Apache License, Version 2.0"
 
-PR = "r0"
+PR = "r1"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
@@ -14,5 +14,5 @@ do_configure() {
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+  autotools_stage_all
 }
diff --git a/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty b/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch
new file mode 100644 (file)
index 0000000..be85ceb
--- /dev/null
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure        2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure     2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+     ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in
+--- binutils-2.16.91.0.7.orig/configure.in     2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.in  2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+     ;;
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
new file mode 100644 (file)
index 0000000..4461bed
--- /dev/null
@@ -0,0 +1,31 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything.  This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler@acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
+--- binutils-2.16.91.0.6/binutils/objcopy.c.ark        2006-03-11 15:59:07.000000000 +0100
++++ binutils-2.16.91.0.6/binutils/objcopy.c    2006-03-11 15:59:45.000000000 +0100
+@@ -2593,7 +2593,8 @@
+         if (preserve_dates)
+           set_times (tmpname, &statbuf);
+         if (output_file == NULL)
+-          smart_rename (tmpname, argv[i], preserve_dates);
++          if(smart_rename (tmpname, argv[i], preserve_dates))
++              hold_status = 1;
+         status = hold_status;
+       }
+       else
+@@ -3184,7 +3185,8 @@
+       {
+         if (preserve_dates)
+           set_times (tmpname, &statbuf);
+-        smart_rename (tmpname, input_filename, preserve_dates);
++        if (smart_rename (tmpname, input_filename, preserve_dates))
++            status = 1;
+       }
+       else
+       unlink (tmpname);
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch
new file mode 100644 (file)
index 0000000..25222e5
--- /dev/null
@@ -0,0 +1,139 @@
+--- binutils-2.16.91.0.7/bfd/configure
++++ binutils-2.16.91.0.7/bfd/configure
+@@ -3576,7 +3576,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+--- binutils-2.16.91.0.7/binutils/configure
++++ binutils-2.16.91.0.7/binutils/configure
+@@ -3411,7 +3411,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+--- binutils-2.16.91.0.7/configure
++++ binutils-2.16.91.0.7/configure
+@@ -1270,7 +1270,7 @@
+   am33_2.0-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+-  sh-*-linux*)
++  sh*-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;    
+   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -1578,7 +1578,7 @@
+   romp-*-*)
+     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${host}" in
+       i[3456789]86-*-vsta) ;; # don't add gprof back in
+       i[3456789]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.16.91.0.7/configure.in
++++ binutils-2.16.91.0.7/configure.in
+@@ -468,7 +468,7 @@
+   am33_2.0-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+-  sh-*-linux*)
++  sh*-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;    
+   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -776,7 +776,7 @@
+   romp-*-*)
+     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${host}" in
+       i[[3456789]]86-*-vsta) ;; # don't add gprof back in
+       i[[3456789]]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.16.91.0.7/gas/configure
++++ binutils-2.16.91.0.7/gas/configure
+@@ -3411,7 +3411,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+--- binutils-2.16.91.0.7/gprof/configure
++++ binutils-2.16.91.0.7/gprof/configure
+@@ -3419,6 +3419,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ netbsd* | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+--- binutils-2.16.91.0.7/ld/configure
++++ binutils-2.16.91.0.7/ld/configure
+@@ -3413,7 +3413,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+--- binutils-2.16.91.0.7/libtool.m4
++++ binutils-2.16.91.0.7/libtool.m4
+@@ -739,7 +739,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+--- binutils-2.16.91.0.7/ltconfig
++++ binutils-2.16.91.0.7/ltconfig
+@@ -602,6 +602,7 @@
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
++linux-uclibc*) ;;
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+@@ -1247,7 +1248,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+--- binutils-2.16.91.0.7/opcodes/configure
++++ binutils-2.16.91.0.7/opcodes/configure
+@@ -3579,7 +3579,7 @@
+   ;;
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch
new file mode 100644 (file)
index 0000000..04a7e61
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris@debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch
new file mode 100644 (file)
index 0000000..f337611
--- /dev/null
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c     2003-07-23 16:08:09.000000000 +0100
++++ binutils-2.14.90.0.6/bfd/opncls.c  2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+   bfd *nbfd;
+   const bfd_target *target_vec;
++  struct stat s;
++
++  if (stat (filename, &s) == 0)
++    if (S_ISDIR(s.st_mode)) {
++      bfd_set_error (bfd_error_file_not_recognized);
++      return NULL;
++    }
+   nbfd = _bfd_new_bfd ();
+   if (nbfd == NULL)
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch
new file mode 100644 (file)
index 0000000..498651a
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em       2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em        2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+             && command_line.rpath == NULL)
+           {
+             lib_path = (const char *) getenv ("LD_RUN_PATH");
++            if ((lib_path) && (strlen (lib_path) == 0))
++                lib_path = NULL;
+             if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+                                                     force))
+               break;
+@@ -871,6 +873,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++      rpath = NULL;
+   if (! (bfd_elf_size_dynamic_sections
+        (output_bfd, command_line.soname, rpath,
+         command_line.filter_shlib,
diff --git a/packages/binutils/binutils-cross_2.17.50.0.8.bb b/packages/binutils/binutils-cross_2.17.50.0.8.bb
new file mode 100644 (file)
index 0000000..1f2f43e
--- /dev/null
@@ -0,0 +1,32 @@
+SECTION = "devel"
+require binutils_${PV}.bb
+inherit cross
+DEPENDS += "flex-native bison-native"
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+PACKAGES = ""
+EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --program-prefix=${TARGET_PREFIX}"
+
+do_stage () {
+       oe_runmake install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${CROSS_DIR}/lib/ldscripts
+       rm -rf ${CROSS_DIR}/share/info
+       rm -rf ${CROSS_DIR}/share/locale
+       rm -rf ${CROSS_DIR}/share/man
+       rmdir ${CROSS_DIR}/share || :
+       rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+       rmdir ${CROSS_DIR}/${libdir} || :
+       rmdir ${CROSS_DIR}/${prefix} || :
+
+       # We want to move this into the target specific location
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+       rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+       :
+}
diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb
new file mode 100644 (file)
index 0000000..49bacac
--- /dev/null
@@ -0,0 +1,12 @@
+require binutils.inc
+
+
+SRC_URI = \
+    "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+     file://110-arm-eabi-conf.patch;patch=1 \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     " 
index 6c3b287..b6bb469 100644 (file)
@@ -3,7 +3,7 @@ HOMEPAGE = "http://e2fsprogs.sf.net"
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 inherit autotools
 
index 3318efb..6d27b77 100644 (file)
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
-          file://autotools.patch;patch=1"
+         "
 S = "${WORKDIR}/expat-${PV}"
 
 export LTCC = "${CC}"
index 48b2b4e..0fd825e 100644 (file)
@@ -1,7 +1,7 @@
 require expat.inc
 PR = "r2"
 
-SRC_URI = "file://autotools.patch;patch=1"
+SRC_URI += "file://autotools.patch;patch=1"
 
 inherit lib_package
 
index 4d58210..4c71b0b 100644 (file)
@@ -1,36 +1,29 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+require fuse.inc
 
-LICENSE = "GPL"
-
-
-DEPENDS = "fakeroot-native"
 RRECOMMENDS = "fuse"
-
 PR = "r1"
 
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
 S = "${WORKDIR}/fuse-${PV}"
-
-inherit autotools pkgconfig module
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
 EXTRA_OECONF = "  --with-kernel=${STAGING_KERNEL_DIR}"
 
+inherit module
+
 do_configure() {
-cd ${S} ; oe_runconf
+       cd ${S} ; oe_runconf
 }
 
 do_compile(){
-LDFLAGS=""
-cd ${S}/kernel
-oe_runmake
+       LDFLAGS=""
+       cd ${S}/kernel
+       oe_runmake
 }
 
 fakeroot do_install() {
-LDFLAGS=""
-install -d ${D}${sysconfdir}/udev/rules.d/
-install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
-cd ${S}/kernel
-oe_runmake install DESTDIR=${D}
+       LDFLAGS=""
+       install -d ${D}${sysconfdir}/udev/rules.d/
+       install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+       cd ${S}/kernel
+       oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
diff --git a/packages/fuse/fuse.inc b/packages/fuse/fuse.inc
new file mode 100644 (file)
index 0000000..abc4085
--- /dev/null
@@ -0,0 +1,13 @@
+DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+HOMEPAGE = "http://fuse.sf.net"
+LICENSE = "GPL"
+DEPENDS = "fakeroot-native"
+RRECOMMENDS_fuse = "fuse-module kernel-module-fuse"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+fakeroot do_install() {
+       oe_runmake install DESTDIR=${D}
+}
index b423e96..1f43ac8 100644 (file)
@@ -1,31 +1,17 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-
-LICENSE_${PN} = "LGPL"
+require fuse.inc
 
 PR = "r1"
 
-DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse"
-
 #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils 
 PACKAGES += "fuse-utils"
 FILES_${PN} = "${libdir}/*.so*"
 FILES_${PN}-dev += "${libdir}/*.la"
 FILES_fuse-utils = "${bindir} ${base_sbindir}"
 DEBIAN_NOAUTONAME_fuse-utils = "1"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
-
-inherit autotools pkgconfig
 EXTRA_OECONF = " --disable-kernel-module"
 
-fakeroot do_install() {
-oe_runmake install DESTDIR=${D}
-}
-
 fakeroot do_stage() {
-autotools_stage_all
+       autotools_stage_all
 }
 
 
index 74dd994..2d5809c 100644 (file)
@@ -1,30 +1,15 @@
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-HOMEPAGE = "http://fuse.sf.net"
-LICENSE = "LGPL"
+require fuse.inc
 
-PR = "r0"
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" 
 
-DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \
-          file://not-run-updaterc.d-on-host.patch;patch=1" 
-
-
-inherit autotools pkgconfig
 EXTRA_OECONF = " --disable-kernel-module"
 
-fakeroot do_install() {
-       oe_runmake install DESTDIR=${D}
-}
-
 #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
 PACKAGES =+ "lib${PN} libulockmgr"
 FILES_${PN}-dev +=     "${libdir}/*.la"
 FILES_lib${PN} =       "${libdir}/libfuse*.so.*"
 FILES_libulockmgr =    "${libdir}/libulockmgr.so.*"
 
-
 fakeroot do_stage() {
        autotools_stage_all
 }
diff --git a/packages/glib-2.0/glib-2.0_2.12.6.bb b/packages/glib-2.0/glib-2.0_2.12.6.bb
new file mode 100644 (file)
index 0000000..aae16bf
--- /dev/null
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
+                     
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
new file mode 100644 (file)
index 0000000..6a33291
--- /dev/null
@@ -0,0 +1,40 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+require glib-2.0.inc
+
+acpaths = ""
+do_configure_prepend () {
+       install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-2.0/glib
+       install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
index d3c6ab0..2323039 100644 (file)
@@ -1,5 +1,7 @@
 require glibc.inc
 
+ARM_INSTRUCTION_SET = "arm"
+
 PR = "r4"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
index ad17916..71ea128 100644 (file)
@@ -9,6 +9,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
 
 inherit autotools 
 
+ARM_INSTRUCTION_SET = "arm"
+
 acpaths = ""
 
 do_stage () {
diff --git a/packages/granule/granule.inc b/packages/granule/granule.inc
new file mode 100644 (file)
index 0000000..7f211b3
--- /dev/null
@@ -0,0 +1,9 @@
+DESCRIPTION = "Generic memory training with flash cards.  Automatic scheduling algorithm."
+AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>"
+HOMEPAGE = "http://granule.sf.net"
+SECTION = "x11/apps"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa"
+
+inherit autotools pkgconfig
index 95f440c..8e68118 100644 (file)
@@ -1,12 +1,4 @@
-DESCRIPTION = "Generic memory training with flash cards.  Automatic scheduling algorithm."
-AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>"
-HOMEPAGE = "http://granule.sf.net"
-SECTION = "x11/apps"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa"
-PR = "r0"
+require granule.inc
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 
-inherit autotools pkgconfig
diff --git a/packages/granule/granule_cvs.bb b/packages/granule/granule_cvs.bb
new file mode 100644 (file)
index 0000000..f4da91f
--- /dev/null
@@ -0,0 +1,17 @@
+require granule.inc
+
+PV = "1.2.4+cvs${SRCDATE}"
+
+EXTRA_OECONF_append_h3600 = " --enable-pda=yes "
+EXTRA_OECONF_append_h3900 = " --enable-pda=yes "
+EXTRA_OECONF_append_h2200 = " --enable-pda=yes "
+EXTRA_OECONF_append_h4000 = " --enable-pda=yes "
+EXTRA_OECONF_append_collie = " --enable-pda=yes "
+EXTRA_OECONF_append_poodle = " --enable-pda=yes "
+EXTRA_OECONF_append_mnci = " --enable-pda=yes "
+EXTRA_OECONF_append_integral13 = " --enable-pda=yes "
+
+SRC_URI = "cvs://anonymous@granule.cvs.sourceforge.net/cvsroot/granule;method=pserver;module=granule"
+
+S = "${WORKDIR}/granule"
+
index 3f4942c..3cca30a 100644 (file)
@@ -14,6 +14,8 @@ inherit autotools binconfig
 
 EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 
+ARM_INSTRUCTION_SET = "arm"
+
 do_stage() {
        oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
        oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc
new file mode 100644 (file)
index 0000000..e73fecb
--- /dev/null
@@ -0,0 +1,51 @@
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+LICENSE = "LGPL"
+
+inherit gnome
+EXTRA_AUTORECONF = ""
+
+SECTION = "x11/libs"
+
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo"
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI += "file://no-tests.patch;patch=1 \
+           "
+
+EXTRA_OECONF = "--disable-glibtest \
+               --enable-explicit-deps=no \
+               --disable-debug"
+
+LEAD_SONAME = "libpango-1.0*"
+LIBV = "1.6.0"
+
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
+do_stage () {
+       autotools_stage_all
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+       prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+       modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+       do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/pango/pango_1.15.2.bb b/packages/pango/pango_1.15.2.bb
new file mode 100644 (file)
index 0000000..8e3e8e7
--- /dev/null
@@ -0,0 +1 @@
+require pango.inc
index ac0b821..3c65d1d 100644 (file)
@@ -1,12 +1,10 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
-DEPENDS = "apr-util-0.9.12 neon"
+DEPENDS = "apr-util neon"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 PR = "r0"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1"
 
@@ -15,8 +13,13 @@ EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
 
+
 inherit autotools
 
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
 do_configure() {
+       gnu-configize
+       libtoolize --force
        oe_runconf
 }
diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty b/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config b/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config
new file mode 100644 (file)
index 0000000..6e606f6
--- /dev/null
@@ -0,0 +1,181 @@
+#
+# Automatically generated make config: don't edit
+# Wed Dec 20 21:41:18 2006
+#
+# 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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/cross/powerpc-linux-uclibc"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# 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"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=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
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+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
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+# UCLIBC_HAS_GNU_GLOB is not set
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty b/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/uclibc/uclibc-cvs/efika/uClibc.config b/packages/uclibc/uclibc-cvs/efika/uClibc.config
new file mode 100644 (file)
index 0000000..23b221d
--- /dev/null
@@ -0,0 +1,180 @@
+#
+# Automatically generated make config: don't edit
+# Wed Dec 20 11:05:48 2006
+#
+# 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_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 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=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/staging/dht-walnut-linux-uclibc/kernel"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# 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"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+# UCLIBC_SUSV3_LEGACY is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=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
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+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
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+# UCLIBC_HAS_GNU_GLOB is not set
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/uclibc/uclibc-cvs/error_print_progname.patch b/packages/uclibc/uclibc-cvs/error_print_progname.patch
new file mode 100644 (file)
index 0000000..6c10ec6
--- /dev/null
@@ -0,0 +1,11 @@
+--- /libc/misc/error/orig-error.c      2006-11-29 14:28:13.000000000 -0500
++++ /libc/misc/error/error.c   2006-12-20 22:54:16.000000000 -0500
+@@ -44,7 +44,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-/* void (*error_print_progname) (void) = NULL; */
++ void (*error_print_progname) (void) = NULL; 
+ extern __typeof(error) __error attribute_hidden;
+ void __error (int status, int errnum, const char *message, ...)
index 1a829a3..d81cfc6 100644 (file)
@@ -121,7 +121,7 @@ do_configure() {
        oe_runmake oldconfig
 }
 
-do_install_prepend() {
+do_stage() {
        # Install into the cross dir (this MUST be done first because we
        # will install crt1.o in the install_dev stage and gcc needs it)
        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
index 568f8d4..10855e6 100644 (file)
@@ -21,12 +21,12 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-# This is the correct KERNEL_SOURCE location, if the uClibc
-# fix_includes.sh script is run (see nokernelheader.patch below)
-# this must be correct.
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
 KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
 SRC_URI += "svn://uclibc.org/trunk;module=uClibc"
 
+SRC_URI += " file://error_print_progname.patch;patch=1"
 S = "${WORKDIR}/uClibc"
 
index c563c48..38172cc 100644 (file)
@@ -54,6 +54,8 @@ S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
 
 inherit autotools pkgconfig 
 
+ARM_INSTRUCTION_SET = "arm"
+
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"
 
index f16f7c7..7c09fde 100644 (file)
@@ -31,4 +31,10 @@ Maintainer:     None
 Reason:         Conflicting namespace with gstreamer 0.10 at build time
 Proposed by:    Koen Kooi
 
+Package Name:  familiar-unstable.conf
+Removal Date:  2007-01-31
+Maintainer:    None
+Reason:                Familiar has forked and the conf files in OE are no longer
+               maintained. This is causing a support problem for oe devs.
+Proposed by:   Graeme Gregory (XorA)