[oe-commits] org.oe.dev merge of '4f3ceea2e479c0f56f4f87cb516cab45429d0856'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Dec 17 21:31:27 UTC 2007
merge of '4f3ceea2e479c0f56f4f87cb516cab45429d0856'
and 'ccdb554f27d940b07a6e6b9686617b0aa58f3374'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 139664597e5ecbd1c49e261c5bcfa86044aaf536
ViewMTN: http://monotone.openembedded.org/revision/info/139664597e5ecbd1c49e261c5bcfa86044aaf536
Files:
1
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/curl/curl_7.16.4.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/linux/linux_2.6.23.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/gcc/files/gcc4-mtune-compat.patch
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc_3.4.4.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/ncurses/ncurses/visibility.patch
packages/ncurses/ncurses_5.4.bb
Diffs:
#
# mt diff -r4f3ceea2e479c0f56f4f87cb516cab45429d0856 -r139664597e5ecbd1c49e261c5bcfa86044aaf536
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7]
# to [7329acd7d0b92e08e302dab3b873ff71a3a5e0da]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
# to [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
#
# patch "packages/curl/curl_7.16.4.bb"
# from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
# to [e059af19afea35121903c9bfbda21700cbf38c07]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [cf4a868ba0d67c665cbdb50b00aad66a166e803a]
# to [cf9f8cb9fd5be055814a58a31b7eafe2772a8658]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [bc9b6320d36d6556339ca6526a84f192b7c3f86f]
# to [f9f0f5550a035d11532343bcf6adeddd9141aacb]
#
# patch "packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig"
# from [27678d7ecddb52724e52d1e6d8bdc0be12b8b32a]
# to [32e0eac7c402ef21b388fc096e69ea47f3ea5d3e]
#
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
# from [230d19e2e48f76e44f8caf816eef47910be90255]
# to [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
#
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
# from [d038fcab32af632acacf324702cc25ae2f298bb7]
# to [679383825421e632b5d7cc7a4a1a719a3b8a403a]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [46f4e7136cce3c8d26a3f7dbc5a80a07611c6e03]
# to [2281487e8d175d81a3be60da3addf3d79106de70]
#
# patch "packages/tasks/task-base.bb"
# from [7a9b59f5510daa79b732e48d67445e1d5ebc4c81]
# to [3005c202e492ec2ec94e87ee07291c4f96060530]
#
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
# from [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
# to [6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528]
#
# patch "packages/uboot/u-boot-utils_1.2.0.bb"
# from [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
# to [a665ab3de0681644fca851349a5fd6339733fb46]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [82f390a2257420604caa01ac186221938ae505ce]
# to [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [b4455938ec659767eadfbe50dd3227b157c2076d]
# to [6578acd7668e306b7372e0e3aebfb95d49fa7961]
#
============================================================
--- conf/distro/angstrom-2007.1.conf c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7
+++ conf/distro/angstrom-2007.1.conf 7329acd7d0b92e08e302dab3b873ff71a3a5e0da
@@ -7,7 +7,7 @@
#@--------------------------------------------------------------------
# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC1"
+DISTRO_VERSION = "2007.11RC1.1"
DISTRO_REVISION = "48"
require conf/distro/include/sane-srcdates.inc
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 2ee34e9004f488e328231f5a1f139e5225d0e2cf
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 9bb6cf26f7a7451d99dda12e51b6584c26194aa5
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
PREFERRED_VERSION_u2nl ?= "1.3"
PREFERRED_VERSION_uae4all ?= "0.7.1"
PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
============================================================
--- packages/curl/curl_7.16.4.bb 9f422993011a8a54e5050ac333fe5e07a7112e3d
+++ packages/curl/curl_7.16.4.bb e059af19afea35121903c9bfbda21700cbf38c07
@@ -12,6 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LI
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--with-gnutls=${STAGING_BINDIR_CROSS}/ \
--without-ssl \
+ --without-libssh2 \
--with-random=/dev/urandom \
--without-libidn \
--enable-crypto-auth \
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig cf4a868ba0d67c665cbdb50b00aad66a166e803a
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig cf9f8cb9fd5be055814a58a31b7eafe2772a8658
@@ -1454,12 +1454,12 @@ CONFIG_NEW_LEDS=y
# CONFIG_MMC_WBSD is not set
# CONFIG_MMC_TIFM_SD is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-CONFIG_LEDS_MPC8313E_RDB=m
+CONFIG_LEDS_MPC8313E_RDB=y
#
# LED Triggers
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch bc9b6320d36d6556339ca6526a84f192b7c3f86f
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch f9f0f5550a035d11532343bcf6adeddd9141aacb
@@ -1,6 +1,6 @@ diff -urN linux-2.6.23.orig/drivers/leds
diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig
--- linux-2.6.23.orig/drivers/leds/Kconfig 2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Kconfig 2007-12-03 11:08:06.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig 2007-12-14 15:32:37.000000000 +0100
@@ -101,6 +101,12 @@
outputs. To be useful the particular board must have LEDs
and they must be connected to the GPIO lines.
@@ -16,8 +16,8 @@ diff -urN linux-2.6.23.orig/drivers/leds
config LEDS_TRIGGERS
diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
--- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-12-03 11:08:36.000000000 +0100
-@@ -0,0 +1,127 @@
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-12-14 15:32:55.000000000 +0100
+@@ -0,0 +1,171 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
+ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
@@ -41,73 +41,115 @@ diff -urN linux-2.6.23.orig/drivers/leds
+#define LEDS_BASE 0xfa000000
+#define LEDS_SIZE 0x2
+
-+static struct platform_dev *leds_pdev = NULL;
++static struct platform_device *leds_pdev = NULL;
+static struct resource *led_mem = NULL;
+static void *led_io = NULL;
-+static u8 led_state = 0;
++static u8 led_state = 0xff;
+
-+static void mpc8313leds_green_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+ led_state = value ? led_state&~32 : led_state|32;
-+ iowrite8(led_state, led_io);
-+}
-+
-+static struct led_classdev mpc8313_green_led = {
-+ .name = "mpc8313:green",
-+ .brightness_set = mpc8313leds_green_set,
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
+};
+
-+static void mpc8313leds_yellow_set(struct led_classdev *led_cdev, enum led_brightness value)
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
+{
-+ led_state = value ? led_state&~64 : led_state|64;
++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++ if (value)
++ led_state &= ~led_dev->bitmask;
++ else
++ led_state |= led_dev->bitmask;
+ iowrite8(led_state, led_io);
+}
+
-+static struct led_classdev mpc8313_yellow_led = {
-+ .name = "mpc8313:yellow",
-+ .brightness_set = mpc8313leds_yellow_set,
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:green",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:yellow",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:red",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
+};
+
-+static void mpc8313leds_red_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+ led_state = value ? led_state&~128 : led_state|128;
-+ iowrite8(led_state, led_io);
-+}
-+
-+static struct led_classdev mpc8313_red_led = {
-+ .name = "mpc8313:red",
-+ .brightness_set = mpc8313leds_red_set,
-+};
-+
+static int mpc8313leds_probe(struct platform_device *pdev)
+{
++ int i;
+ int ret;
-+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_green_led);
-+ if (ret < 0)
-+ return ret;
++
++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++ ret = led_classdev_register(&pdev->dev,
++ &mpc8313_leds[i].cdev);
++ }
+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_yellow_led);
-+ if (ret < 0)
-+ return ret;
++ if (ret < 0 && i > 1) {
++ for (i = i - 2; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++ }
+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_red_led);
-+ if (ret < 0)
-+ return ret;
-+
+ return ret;
+}
+
+static int mpc8313leds_remove(struct platform_device *pdev)
+{
-+ led_classdev_unregister(&mpc8313_green_led);
-+ led_classdev_unregister(&mpc8313_yellow_led);
-+ led_classdev_unregister(&mpc8313_red_led);
++ int i;
++
++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++
+ return 0;
+}
+
+static struct platform_driver mpc8313leds_driver = {
-+ .driver = {
++ .driver = {
+ .name = "mpc8313-leds",
+ .owner = THIS_MODULE,
+ },
@@ -125,6 +167,8 @@ diff -urN linux-2.6.23.orig/drivers/leds
+ led_mem = NULL;
+ return -ENOMEM;
+ }
++ iowrite8(led_state, led_io);
++
+ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
+
+ return platform_driver_register(&mpc8313leds_driver);
@@ -147,7 +191,7 @@ diff -urN linux-2.6.23.orig/drivers/leds
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile
--- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Makefile 2007-12-03 11:08:06.000000000 +0100
++++ linux-2.6.23/drivers/leds/Makefile 2007-12-14 15:32:37.000000000 +0100
@@ -17,6 +17,7 @@
obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
============================================================
--- packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig 27678d7ecddb52724e52d1e6d8bdc0be12b8b32a
+++ packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig 32e0eac7c402ef21b388fc096e69ea47f3ea5d3e
@@ -1413,12 +1413,12 @@ CONFIG_NEW_LEDS=y
# CONFIG_MMC_WBSD is not set
# CONFIG_MMC_TIFM_SD is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-CONFIG_LEDS_MPC832X=m
+CONFIG_LEDS_MPC832X=y
#
# LED Triggers
============================================================
--- packages/linux/linux-linkstationarm_2.6.12.bb 230d19e2e48f76e44f8caf816eef47910be90255
+++ packages/linux/linux-linkstationarm_2.6.12.bb 5c531f3ff8db593954394d2cd7b0bbf6d5f3c034
@@ -1,6 +1,7 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
SECTION = "kernel"
LICENSE = "GPL"
+DEPENDS += "u-boot-utils-native"
PR = "r2"
COMPATIBLE_MACHINE = "lsarm"
============================================================
--- packages/linux/linux-linkstationppc_2.6.21-rc5.bb d038fcab32af632acacf324702cc25ae2f298bb7
+++ packages/linux/linux-linkstationppc_2.6.21-rc5.bb 679383825421e632b5d7cc7a4a1a719a3b8a403a
@@ -1,9 +1,9 @@ PR = "r0"
DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5"
SECTION = "kernel"
LICENSE = "GPL"
PR = "r0"
-DEPENDS = "dtc-native"
+DEPENDS = "dtc-native u-boot-utils-native"
COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
============================================================
--- packages/linux/linux_2.6.23.bb 46f4e7136cce3c8d26a3f7dbc5a80a07611c6e03
+++ packages/linux/linux_2.6.23.bb 2281487e8d175d81a3be60da3addf3d79106de70
@@ -9,7 +9,7 @@ DEPENDS_append_mpc8323e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
DEPENDS_append_mpc8323e-rdb = " dtc-native"
-PR = "r7"
+PR = "r8"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://binutils-buildid-arm.patch;patch=1 \
============================================================
--- packages/tasks/task-base.bb 7a9b59f5510daa79b732e48d67445e1d5ebc4c81
+++ packages/tasks/task-base.bb 3005c202e492ec2ec94e87ee07291c4f96060530
@@ -295,7 +295,7 @@ RDEPENDS_task-base-uboot = "\
kernel-module-usb-storage "
RDEPENDS_task-base-uboot = "\
- u-boot-utils-native"
+ u-boot"
RDEPENDS_task-base-redboot = "\
fis"
============================================================
--- packages/uboot/u-boot-utils-native_1.2.0.bb a79cb700407a2e90e0c039014ac9e7ebb0f22219
+++ packages/uboot/u-boot-utils-native_1.2.0.bb 6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528
@@ -22,7 +22,6 @@ do_stage() {
# install mkimage for the kernel makefile
do_stage() {
- install -d ${STAGING_BINDIR_NATIVE}
- install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
+ install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/
}
============================================================
--- packages/uboot/u-boot-utils_1.2.0.bb 64396fa43c9fcef1ed1cd3ae82a49d140febbbd0
+++ packages/uboot/u-boot-utils_1.2.0.bb a665ab3de0681644fca851349a5fd6339733fb46
@@ -1,12 +1,11 @@ LICENSE = "GPL"
DESCRIPTION = "U-boot bootloader OS env. access tools"
SECTION = "bootloaders"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS_openprotium = "mtd-utils"
+DEPENDS = "mtd-utils"
PR = "r7"
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
-SRC_URI_append_openprotium = " \
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
file://fw_env.c.patch;patch=1 \
file://tools-Makefile.patch;patch=1 \
file://env-Makefile.patch;patch=1 \
@@ -16,8 +15,6 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
-EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}"
-
do_configure() {
:
}
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 82f390a2257420604caa01ac186221938ae505ce
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 684d183b9b73eecbbdb15dc21ff863ae212a9e98
@@ -118,4 +118,4 @@ DISPLAY=':0'
DISPLAY=':0'
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* >/tmp/x.log 2>&1
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b4455938ec659767eadfbe50dd3227b157c2076d
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 6578acd7668e306b7372e0e3aebfb95d49fa7961
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r24"
+PR = "r25"
SRC_URI = "\
file://Xdefaults \
#
# mt diff -rccdb554f27d940b07a6e6b9686617b0aa58f3374 -r139664597e5ecbd1c49e261c5bcfa86044aaf536
#
#
#
# add_file "packages/gcc/files/gcc4-mtune-compat.patch"
# content [7f1c7b590473405ac775e30f798822df399124bb]
#
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
# from [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
# to [5f68404197e1e64b85ecc871a56c3b92bcf9f7aa]
#
# patch "packages/gcc/gcc-cross_3.4.4.bb"
# from [674605b2ebdca6409f1f687a9e7245c47464037d]
# to [453cf98f7ad3555176dec060ff5490029d02f14b]
#
# patch "packages/gcc/gcc_3.4.4.bb"
# from [8218fda182662f3f4bcb0f5857619e901d8b6484]
# to [cc912610fb5388443a043951f51dfe5831de626f]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
# from [62dcdcd2c929e0438841921e99fbfd336aa71d27]
# to [1591ece17925b88a031d76f96246cad5d04d3424]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
# from [d423e0a23731766a495f814c464864df869a77bd]
# to [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
# from [1793c1f183598c2d981b16023c4a14245807fc77]
# to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
# from [1793c1f183598c2d981b16023c4a14245807fc77]
# to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#
# patch "packages/ncurses/ncurses/visibility.patch"
# from [847022687599a039689754695c85fae33fa139c5]
# to [28c01d83f1ec0a069a217abdc954a822126275ac]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [72e763fb5ea691972f152eeaf0b2df386fa086d8]
# to [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
#
============================================================
--- packages/gcc/files/gcc4-mtune-compat.patch 7f1c7b590473405ac775e30f798822df399124bb
+++ packages/gcc/files/gcc4-mtune-compat.patch 7f1c7b590473405ac775e30f798822df399124bb
@@ -0,0 +1,14 @@
+Patch for gcc3 to support gcc4-compatible (and consistent) values for -mtune= option.
+
+--- gcc-3.4.4/gcc/config/arm/arm.c.org 2007-12-15 23:58:35.000000000 +0200
++++ gcc-3.4.4/gcc/config/arm/arm.c 2007-12-16 00:20:39.000000000 +0200
+@@ -432,7 +432,9 @@
+ {"arm10tdmi", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_ARCH5 },
+ {"arm1020t", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_ARCH5 },
+ {"arm926ejs", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E },
++ {"arm926ej-s", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E },
+ {"arm1026ejs", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E },
++ {"arm1026ej-s", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_ARCH5 | FL_ARCH5E },
+ {"xscale", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE },
+ {"iwmmxt", FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE | FL_IWMMXT },
+ /* V6 Architecture Processors */
============================================================
--- packages/gcc/gcc-cross-sdk_3.4.4.bb ffaafb6a6ef931a5cd71c7623aba38189dc94161
+++ packages/gcc/gcc-cross-sdk_3.4.4.bb 5f68404197e1e64b85ecc871a56c3b92bcf9f7aa
@@ -1,9 +1,9 @@ require gcc_${PV}.bb
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
require gcc_${PV}.bb
-PR = "r1"
+PR = "r2"
inherit sdk
============================================================
--- packages/gcc/gcc-cross_3.4.4.bb 674605b2ebdca6409f1f687a9e7245c47464037d
+++ packages/gcc/gcc-cross_3.4.4.bb 453cf98f7ad3555176dec060ff5490029d02f14b
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r6"
+PR = "r7"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_3.4.4.bb 8218fda182662f3f4bcb0f5857619e901d8b6484
+++ packages/gcc/gcc_3.4.4.bb cc912610fb5388443a043951f51dfe5831de626f
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
@@ -23,7 +23,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/g
file://15342.patch;patch=1 \
file://always-fixincperm.patch;patch=1 \
file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
- file://zecke-xgcc-cpp.patch;patch=1 "
+ file://zecke-xgcc-cpp.patch;patch=1 \
+ file://gcc4-mtune-compat.patch;patch=1"
SRC_URI += "file://gcc34-configure.in.patch;patch=1"
SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.18.bb 62dcdcd2c929e0438841921e99fbfd336aa71d27
+++ packages/linux-libc-headers/linux-libc-headers_2.6.18.bb 1591ece17925b88a031d76f96246cad5d04d3424
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
file://arm-syscall-define.patch;patch=1"
@@ -38,7 +38,7 @@ do_install() {
do_install() {
set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH}
}
do_install_append_arm() {
@@ -51,7 +51,7 @@ do_stage () {
set_arch
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
- oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=${ARCH}
if [ "${ARCH}" == "arm" ]; then
cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
fi
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.20.bb d423e0a23731766a495f814c464864df869a77bd
+++ packages/linux-libc-headers/linux-libc-headers_2.6.20.bb 6ca5c4e670c6594210c1afa9d59511ab71dfe839
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://procinfo.h"
@@ -40,7 +40,7 @@ do_install() {
do_install() {
set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
}
do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
echo $ARCH
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
- oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
if [ "$ARCH" = "arm" ]; then
cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
fi
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.22.bb 1793c1f183598c2d981b16023c4a14245807fc77
+++ packages/linux-libc-headers/linux-libc-headers_2.6.22.bb 66ed33603a1599bc68718e22c5e7fe1d81ff51cc
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://procinfo.h"
@@ -40,7 +40,7 @@ do_install() {
do_install() {
set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
}
do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
echo $ARCH
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
- oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
if [ "$ARCH" = "arm" ]; then
cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
fi
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.23.bb 1793c1f183598c2d981b16023c4a14245807fc77
+++ packages/linux-libc-headers/linux-libc-headers_2.6.23.bb 66ed33603a1599bc68718e22c5e7fe1d81ff51cc
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://procinfo.h"
@@ -40,7 +40,7 @@ do_install() {
do_install() {
set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
}
do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
echo $ARCH
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
- oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
if [ "$ARCH" = "arm" ]; then
cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
fi
============================================================
--- packages/ncurses/ncurses/visibility.patch 847022687599a039689754695c85fae33fa139c5
+++ packages/ncurses/ncurses/visibility.patch 28c01d83f1ec0a069a217abdc954a822126275ac
@@ -2187,14 +2187,14 @@
+ CPPFLAGS="-I\$(srcdir)/../include $CPPFLAGS"
+fi
+if test "$GCC" != yes; then
-+ CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++ CPPFLAGS="$CPPFLAGS"
+elif test "$includedir" != "/usr/include"; then
+ if test "$includedir" = '${prefix}/include' ; then
+ if test $prefix != /usr ; then
-+ CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++ CPPFLAGS="$CPPFLAGS"
+ fi
+ else
-+ CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++ CPPFLAGS="$CPPFLAGS"
+ fi
+fi
+AC_SUBST(CPPFLAGS)
============================================================
--- packages/ncurses/ncurses_5.4.bb 72e763fb5ea691972f152eeaf0b2df386fa086d8
+++ packages/ncurses/ncurses_5.4.bb a2950eea2cdd28c32834e38f248e4bae8471d9c1
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://visibility.patch;patch=1"
More information about the Openembedded-commits
mailing list