[oe-commits] org.oe.dev merge of '4d43ab58fc4f4986ece87cba9814bd2c1a63434d'
rwhitby commit
oe at amethyst.openembedded.net
Sun Apr 6 10:42:58 UTC 2008
merge of '4d43ab58fc4f4986ece87cba9814bd2c1a63434d'
and 'bcc47d35b4f4f02379b2ed9b7110078ab656814a'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c75d1037d7cc91aba2f6dada3011cd98c56fba81
ViewMTN: http://monotone.openembedded.org/revision/info/c75d1037d7cc91aba2f6dada3011cd98c56fba81
Files:
1
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/glibc/files/glibc-includes-fixed-isystem.patch
packages/klibc/files/dash_readopt.patch
classes/testlab.bbclass
conf/distro/include/angstrom-glibc.inc
conf/distro/include/moko-autorev.inc
conf/machine/beagleboard.conf
conf/machine/include/tune-cortexa8.inc
conf/machine/include/tune-strongarm.inc
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc_1.5.bb
packages/linux/linux-rp_2.6.24.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.4.bb
site/common
site/common-uclibc
Diffs:
#
# mt diff -r4d43ab58fc4f4986ece87cba9814bd2c1a63434d -rc75d1037d7cc91aba2f6dada3011cd98c56fba81
#
#
#
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
# from [c1b4c06be7a3fbdca153a8f990cb07da43231f80]
# to [742bc8620ae607e6abd44f47e0f93708bf7fd6be]
#
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
# from [1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d]
# to [11425bbcbdf82307c0715e66398f0cd967813f80]
#
# patch "packages/linux/linux-ixp4xx_2.6.24.4.bb"
# from [731be652b07a8d40d22b784dcaf1d3ed048cdf8e]
# to [0b69f35f287cafb1adc412c0a0ab039833d806e0]
#
============================================================
--- packages/linux/linux-ixp4xx/defconfig-2.6.24.4 c1b4c06be7a3fbdca153a8f990cb07da43231f80
+++ packages/linux/linux-ixp4xx/defconfig-2.6.24.4 742bc8620ae607e6abd44f47e0f93708bf7fd6be
@@ -163,7 +163,7 @@ CONFIG_DMABOUNCE=y
# IXP4xx Options
#
CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_QMGR=y
CONFIG_IXP4XX_NPE=y
============================================================
--- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d
+++ packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 11425bbcbdf82307c0715e66398f0cd967813f80
@@ -163,7 +163,7 @@ CONFIG_DMABOUNCE=y
# IXP4xx Options
#
CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_QMGR=y
CONFIG_IXP4XX_NPE=y
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.4.bb 731be652b07a8d40d22b784dcaf1d3ed048cdf8e
+++ packages/linux/linux-ixp4xx_2.6.24.4.bb 0b69f35f287cafb1adc412c0a0ab039833d806e0
@@ -8,7 +8,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-# PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
#
# mt diff -rbcc47d35b4f4f02379b2ed9b7110078ab656814a -rc75d1037d7cc91aba2f6dada3011cd98c56fba81
#
#
#
# add_file "packages/glibc/files/glibc-includes-fixed-isystem.patch"
# content [e4a15eb6c16cd9cc9d0fb3ed592ed251c717f485]
#
# add_file "packages/klibc/files/dash_readopt.patch"
# content [2d3de90f28a29999a66550e5aaca8a8f3cfaf83a]
#
# patch "classes/testlab.bbclass"
# from [c3d610ac3c54bb4174b19e9905964f8a4064cc07]
# to [5b201781b52cc5d7ecac3f2a8def33b8a8bd00d5]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [b655e2595b0beb2adddbf6f2e4f114b047128d2a]
# to [c9c2178c9ac5351dd18a863b3007828d54e05c14]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [9a1c96718efce77233cdcd54100dcf160e30b2c4]
# to [8da4790adafd1e42f3daf64be054e6bc26ee8c2e]
#
# patch "conf/machine/beagleboard.conf"
# from [d04d970950e819d37c7d2c86bf48f9acad397d7b]
# to [600f5c43f12d2de1e453ff501297abf5a5cc0f64]
#
# patch "conf/machine/include/tune-cortexa8.inc"
# from [734dda5b38d4eb44e7d1a77fec089371a02c50be]
# to [735ab38d1af46e583d3967f46d6de643ea138edb]
#
# patch "conf/machine/include/tune-strongarm.inc"
# from [05471dc0b54ab7a2645738ef50732cc747c8c18b]
# to [2d96262fc7de2c227cb3bf36728b3c7a0dc3b5a1]
#
# patch "packages/klibc/klibc-common.inc"
# from [0b9a0adbd117c10f5bb84fbf3ee804a7373b5cd4]
# to [f63bcd79d6bf261ecf2b188db14fc0d05f566d49]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [bb59cb03472acf16f6afda69a0226c56b3cc6069]
# to [294377bb13d3cf5efd6994870abd0ab9791b2c7b]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [54454c58faea62364d535ea1e36fb73b2e9f8115]
# to [7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [57db448f20e39546eebbc6770507fc68be79e571]
# to [e4a4aabc3012812e10c0db59477c0588e77a0d80]
#
# patch "packages/ncurses/ncurses.inc"
# from [7eb4e260d67cd98e1401062553cf01da9cfb97c7]
# to [4164caed933388463dadf057e4b722cfd6631553]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [1b3d153d70dfb9c8369190b60cb214c75e79fcfb]
# to [c26a0d1dc90281a8f33c6cfbbe371959f12698ad]
#
# patch "site/common"
# from [cdf94deb262bc3c01c24a16c1228e5b016e9fb04]
# to [857abced4aa9fe4d65b58b9a23c6d110159eb31a]
#
# patch "site/common-uclibc"
# from [a086778ff7aa07ec040f6f0a673669a4c4c3e38d]
# to [5e2a71f7c17c399176ed9badbe2e50fd7b45deea]
#
============================================================
--- packages/glibc/files/glibc-includes-fixed-isystem.patch e4a15eb6c16cd9cc9d0fb3ed592ed251c717f485
+++ packages/glibc/files/glibc-includes-fixed-isystem.patch e4a15eb6c16cd9cc9d0fb3ed592ed251c717f485
@@ -0,0 +1,32 @@
+http://sourceware.org/ml/libc-alpha/2007-03/msg00017.html:
+
+GCC trunk now has multiple internal headers directories, one
+containing the self-contained GCC-provided headers and one containing
+the <limits.h> (not self-contained but including libc's <limits.h> or
+a fixed version thereof) and the fixed headers; more such directories
+may be added in future.
+
+When glibc uses -nostdinc, it needs to use -isystem options for all
+these internal directories. This patch teaches it about the
+include-fixed directory (and is harmless with old GCC versions without
+that directory).
+
+2007-03-18 Joseph Myers <joseph at codesourcery.com>
+
+ * configure.in: Also pass -isystem option for GCC's include-fixed
+ directory.
+ * configure: Regenerate.
+
+Index: configure.in
+===================================================================
+--- /tmp/configure.in 2008-04-05 19:20:52.176759390 +0200
++++ glibc-2.6.1/configure.in 2008-04-05 19:21:26.663424600 +0200
+@@ -912,7 +912,7 @@
+ # thing on a system that doesn't need fixincludes. (Not presently a problem.)
+ if test -n "$sysheaders"; then
+ ccheaders=`$CC -print-file-name=include`
+- SYSINCLUDES="-nostdinc -isystem $ccheaders \
++ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
+ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
+ if test -n "$CXX"; then
+ cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
============================================================
--- packages/klibc/files/dash_readopt.patch 2d3de90f28a29999a66550e5aaca8a8f3cfaf83a
+++ packages/klibc/files/dash_readopt.patch 2d3de90f28a29999a66550e5aaca8a8f3cfaf83a
@@ -0,0 +1,105 @@
+Index: klibc-1.5/usr/dash/miscbltin.c
+===================================================================
+--- klibc-1.5.orig/usr/dash/miscbltin.c 2008-03-27 20:38:09.354564817 +0100
++++ klibc-1.5/usr/dash/miscbltin.c 2008-04-04 18:05:32.063364195 +0200
+@@ -46,6 +46,7 @@
+ #include <ctype.h>
+ #include <stdint.h>
+ #include <time.h> /* strtotimeval() */
++#include <termios.h>
+
+ #include "shell.h"
+ #include "options.h"
+@@ -83,6 +84,11 @@
+ int timeout;
+ int i;
+ fd_set set;
++ int n_flag = 0;
++ unsigned int nchars = 0;
++ int silent = 0;
++ struct termios tty, old_tty;
++
+ struct timeval ts, t0, t1, to;
+
+ ts.tv_sec = ts.tv_usec = 0;
+@@ -90,11 +96,18 @@
+ rflag = 0;
+ timeout = 0;
+ prompt = NULL;
+- while ((i = nextopt("p:rt:")) != '\0') {
++ while ((i = nextopt("p:rt:n:s")) != '\0') {
+ switch(i) {
+ case 'p':
+ prompt = optionarg;
+ break;
++ case 'n':
++ nchars = strtoul(optionarg, NULL, 10);
++ n_flag = nchars; /* just a flag "nchars is nonzero" */
++ break;
++ case 's':
++ silent = 1;
++ break;
+ case 't':
+ p = strtotimeval(optionarg, &ts);
+ if (*p || (!ts.tv_sec && !ts.tv_usec))
+@@ -118,6 +131,23 @@
+ sh_error("arg count");
+ if ((ifs = bltinlookup("IFS")) == NULL)
+ ifs = defifs;
++ if (n_flag || silent) {
++ if (tcgetattr(0, &tty) != 0) {
++ /* Not a tty */
++ n_flag = 0;
++ silent = 0;
++ } else {
++ old_tty = tty;
++ if (n_flag) {
++ tty.c_lflag &= ~ICANON;
++ tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
++ }
++ if (silent) {
++ tty.c_lflag &= ~(ECHO | ECHOK | ECHONL);
++ }
++ tcsetattr(0, TCSANOW, &tty);
++ }
++ }
+ status = 0;
+ startword = 1;
+ backslash = 0;
+@@ -133,13 +163,15 @@
+ ts.tv_sec += t0.tv_sec;
+ }
+ STARTSTACKSTR(p);
+- for (;;) {
++ do {
+ if (timeout) {
+ gettimeofday(&t1, NULL);
+ if (t1.tv_sec > ts.tv_sec ||
+ (t1.tv_sec == ts.tv_sec &&
+ t1.tv_usec >= ts.tv_usec)) {
+ status = 1;
++ if (n_flag)
++ tcsetattr(0, TCSANOW, &old_tty);
+ break; /* Timeout! */
+ }
+
+@@ -156,6 +188,8 @@
+ FD_SET(0, &set);
+ if (select(1, &set, NULL, NULL, &to) != 1) {
+ status = 1;
++ if (n_flag)
++ tcsetattr(0, TCSANOW, &old_tty);
+ break; /* Timeout! */
+ }
+ }
+@@ -191,7 +225,9 @@
+ put:
+ STPUTC(c, p);
+ }
+- }
++ } while (!n_flag || --nchars);
++ if (n_flag || silent)
++ tcsetattr(0, TCSANOW, &old_tty);
+ STACKSTRNUL(p);
+ /* Remove trailing blanks */
+ while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL)
============================================================
--- classes/testlab.bbclass c3d610ac3c54bb4174b19e9905964f8a4064cc07
+++ classes/testlab.bbclass 5b201781b52cc5d7ecac3f2a8def33b8a8bd00d5
@@ -32,7 +32,7 @@ if [ -e ${IMAGE_ROOTFS}/etc/opkg ] ; th
echo -e "digraph depends {\n node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do
- opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}' >> ${TESTLAB_DIR}/installed-packages.txt
+ opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}' >> ${TESTLAB_DIR}/installed-packages.txt
for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do
echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
@@ -57,7 +57,7 @@ if [ -e ${IMAGE_ROOTFS}/etc/opkg ] ; th
#dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate-nomodules.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot
for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do
- du -k $(find ${DEPLOY_DIR_IPK} -name "$file")
+ du -k $(find ${DEPLOY_DIR_IPK} -name "$file") | head -n1
done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt
fi
}
============================================================
--- conf/distro/include/angstrom-glibc.inc b655e2595b0beb2adddbf6f2e4f114b047128d2a
+++ conf/distro/include/angstrom-glibc.inc c9c2178c9ac5351dd18a863b3007828d54e05c14
@@ -12,10 +12,10 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.
# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -Os"
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
-FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
============================================================
--- conf/distro/include/moko-autorev.inc 9a1c96718efce77233cdcd54100dcf160e30b2c4
+++ conf/distro/include/moko-autorev.inc 8da4790adafd1e42f3daf64be054e6bc26ee8c2e
@@ -1,3 +1,10 @@
+SRCREV_pn-assassin ?= "${AUTOREV}"
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+
SRCREV_pn-libgsmd ?= "${AUTOREV}"
SRCREV_pn-libjana ?= "${AUTOREV}"
SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
@@ -7,16 +14,10 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUT
SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
-SRCREV_pn-assassin ?= "${AUTOREV}"
-SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
-SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
SRCREV_pn-neod ?= "${AUTOREV}"
-SRCREV_pn-opkg ?= "${AUTOREV}"
-SRCREV_pn-opkg-native ?= "${AUTOREV}"
-SRCREV_pn-multitap-pad ?= "${AUTOREV}"
-
SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
@@ -52,12 +53,12 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
SRCREV_pn-python-gsmd ?= "${AUTOREV}"
SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}"
-SRCREV_pn-dfu-util ?= "${AUTOREV}"
-SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
SRCREV_pn-usbpath-native ?= "${AUTOREV}"
============================================================
--- conf/machine/beagleboard.conf d04d970950e819d37c7d2c86bf48f9acad397d7b
+++ conf/machine/beagleboard.conf 600f5c43f12d2de1e453ff501297abf5a5cc0f64
@@ -2,7 +2,7 @@ TARGET_ARCH = "arm"
#@NAME: Beagleboard machine
#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7-a"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
============================================================
--- conf/machine/include/tune-cortexa8.inc 734dda5b38d4eb44e7d1a77fec089371a02c50be
+++ conf/machine/include/tune-cortexa8.inc 735ab38d1af46e583d3967f46d6de643ea138edb
@@ -1,4 +1,3 @@
-# valid options for -march: `armv7', `armv7-a'
-TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
-FEED_ARCH = "armv7"
-PACKAGE_ARCH = "armv7"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
+FEED_ARCH = "armv7a"
+PACKAGE_ARCH = "armv7a"
============================================================
--- conf/machine/include/tune-strongarm.inc 05471dc0b54ab7a2645738ef50732cc747c8c18b
+++ conf/machine/include/tune-strongarm.inc 2d96262fc7de2c227cb3bf36728b3c7a0dc3b5a1
@@ -2,5 +2,6 @@
# gcc does not differentiate between the different Strongarm versions, so neither do we
# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
+ARM_ABI = "oabi"
TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
============================================================
--- packages/klibc/klibc-common.inc 0b9a0adbd117c10f5bb84fbf3ee804a7373b5cd4
+++ packages/klibc/klibc-common.inc f63bcd79d6bf261ecf2b188db14fc0d05f566d49
@@ -8,6 +8,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
file://modprobe.patch;patch=1 \
file://losetup.patch;patch=1 \
+ file://dash_readopt.patch;patch=1 \
"
S = "${WORKDIR}/klibc-${PV}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb bb59cb03472acf16f6afda69a0226c56b3cc6069
+++ packages/klibc/klibc-utils-static_1.5.bb 294377bb13d3cf5efd6994870abd0ab9791b2c7b
@@ -1,6 +1,6 @@ require klibc-common.inc
require klibc-common.inc
-PR = "r8"
+PR = "r9"
# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
============================================================
--- packages/klibc/klibc_1.5.bb 54454c58faea62364d535ea1e36fb73b2e9f8115
+++ packages/klibc/klibc_1.5.bb 7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8
@@ -1,2 +1,2 @@ require klibc.inc
require klibc.inc
+PR = "r7"
-PR = "r6"
============================================================
--- packages/linux/linux-rp_2.6.24.bb 57db448f20e39546eebbc6770507fc68be79e571
+++ packages/linux/linux-rp_2.6.24.bb e4a4aabc3012812e10c0db59477c0588e77a0d80
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r8"
+PR = "r9"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
@@ -100,7 +100,7 @@ SRC_URI_append_collie = "\
${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
${TKSRC}/sa1100_spinlock.patch;patch=1 \
${TKSRC}/sa1100-dma.patch;patch=1 \
- ${TKSRC}/sa1100_udc_g_ether.patch;patch=1 \
+ ${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \
"
SRC_URI_append_poodle = "\
============================================================
--- packages/ncurses/ncurses.inc 7eb4e260d67cd98e1401062553cf01da9cfb97c7
+++ packages/ncurses/ncurses.inc 4164caed933388463dadf057e4b722cfd6631553
@@ -83,6 +83,9 @@ FILES_${PN}-ncurses = "${libdir}/libncur
PACKAGES =+ "${PN}-ncurses ${PN}-panel ${PN}-menu ${PN}-form ${PN}-terminfo ${PN}-tools"
FILES_${PN}-ncurses = "${libdir}/libncurses.so.*"
+# You can'r really run any ncurses app without terminfo files, which is why the packaging was that way before mickeyl broke it.
+# This RRECOMMENDS should pull in terminfo to fix that
+RRECOMMENDS_${PN}-ncurses = "${PN}-terminfo"
FILES_${PN}-panel = "${libdir}/libpanel.so.*"
FILES_${PN}-menu = "${libdir}/libmenu.so.*"
FILES_${PN}-form = "${libdir}/libform.so.*"
============================================================
--- packages/ncurses/ncurses_5.4.bb 1b3d153d70dfb9c8369190b60cb214c75e79fcfb
+++ packages/ncurses/ncurses_5.4.bb c26a0d1dc90281a8f33c6cfbbe371959f12698ad
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://visibility.patch;patch=1"
============================================================
--- site/common cdf94deb262bc3c01c24a16c1228e5b016e9fb04
+++ site/common 857abced4aa9fe4d65b58b9a23c6d110159eb31a
@@ -3,3 +3,4 @@ ac_cv_file__dev_random=${ac_cv_file__dev
# Normally kernels have /dev/random enabled
ac_cv_file__dev_random=${ac_cv_file__dev_random=yes}
+
=================================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list