[oe-commits] org.oe.dev merge of '389484dfad182c53a2fb5eaf6187ed377f1f3cca'
thebohemian commit
oe at amethyst.openembedded.net
Wed Apr 23 00:12:00 UTC 2008
merge of '389484dfad182c53a2fb5eaf6187ed377f1f3cca'
and '7eb73c04272e5f591408e55a3e59c911bbdedd90'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44
ViewMTN: http://monotone.openembedded.org/revision/info/16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44
Files:
1
conf/distro/chinook-compat.conf
conf/machine/haleakala.conf
conf/machine/kilauea.conf
packages/linux/linux-2.6.25/haleakala
packages/linux/linux-2.6.25/kilauea
packages/gcc/gcc-configure-cross.inc
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_4.3.0.bb
packages/linux/linux.inc
packages/linux/linux_2.6.25.bb
Diffs:
#
# mt diff -r389484dfad182c53a2fb5eaf6187ed377f1f3cca -r16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44
#
#
#
# patch "conf/distro/chinook-compat.conf"
# from [271e8379588ab95358ace72a9bc2946e8fcca2b7]
# to [c5844f900694f22660695c8b7f810b0ff9eb235c]
#
============================================================
--- conf/distro/chinook-compat.conf 271e8379588ab95358ace72a9bc2946e8fcca2b7
+++ conf/distro/chinook-compat.conf c5844f900694f22660695c8b7f810b0ff9eb235c
@@ -189,7 +189,7 @@ DEBIANNAME_dbus_pn-dbus = "dbus"
PKG_glib-2.0 = "libglib2.0-0"
PKG_gconf = "libgconf2-6"
DEBIANNAME_dbus_pn-dbus = "dbus"
-PKG_hildon-1 = "libhildon1"
+PKG_libhildon = "libhildon1"
PKG_zlib = "zlib1g"
PKG_libglade = "libglade2-0"
#
# mt diff -r7eb73c04272e5f591408e55a3e59c911bbdedd90 -r16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44
#
#
#
# rename "conf/machine/haleakala.conf"
# to "conf/machine/kilauea.conf"
#
# rename "packages/linux/linux-2.6.25/haleakala"
# to "packages/linux/linux-2.6.25/kilauea"
#
# patch "conf/machine/kilauea.conf"
# from [90b86b1f2d353353d703b636c13b8596d42bce71]
# to [b8d4eafb5b2a0323eb8153a71af47361d9cc1b01]
#
# patch "packages/gcc/gcc-configure-cross.inc"
# from [3990357451a08ec6257ea5ed8657804e6d383af7]
# to [703d1979546f41f4a81d5aed72bf335e2bc5c69e]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [cb054117aa91f7b4393fe9b091deb2bdd2a10494]
# to [cfdd84524cbbd1e1c34dcde580d69028a2911e09]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [b1163567031435869bb032598838e3e47eb8ea64]
# to [748e5c3cd4f91c91b8da804a00b7c4dbe4722ff3]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [433bff967d743e14df01b1d904ef3fab59369639]
# to [fc3f8ff824802c98b43d96daad8b3625ed7d7297]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [1ed2f60e65e1b09e4a5637ab29c85ad02338061f]
# to [0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1]
#
# patch "packages/gcc/gcc-cross_4.3.0.bb"
# from [6cf8f04c1b793136fa18d9dd62e474f0d85ea003]
# to [4624dce6b1ba076d4ae2d489e5808e69f56fd1b9]
#
# patch "packages/linux/linux.inc"
# from [0525f17ddb97e53c1c7ec5e4875ece888e8cce26]
# to [13b7e845fdd0aabc17bee1ece748e62ea7a565e5]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [74f819b82816e9036853dba786fe74026211e25d]
# to [7357de969e9609eeedf602d412814cadda96d7cb]
#
============================================================
--- conf/machine/haleakala.conf 90b86b1f2d353353d703b636c13b8596d42bce71
+++ conf/machine/kilauea.conf b8d4eafb5b2a0323eb8153a71af47361d9cc1b01
@@ -1,6 +1,6 @@
#@TYPE: Machine
-#@Name: AMCC Haleakala (405EXr)
-#@DESCRIPTION: Machine configuration for the AMCC Haleakala (405EXr)
+#@Name: AMCC Kilauea (405EX)
+#@DESCRIPTION: Machine configuration for the AMCC Kilauea (405EX)
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc405"
============================================================
--- packages/gcc/gcc-configure-cross.inc 3990357451a08ec6257ea5ed8657804e6d383af7
+++ packages/gcc/gcc-configure-cross.inc 703d1979546f41f4a81d5aed72bf335e2bc5c69e
@@ -49,7 +49,9 @@ do_stage_append () {
done
#fix up libsupc++ and libstdc++ la files
- sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true
- sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true
+ for d in lib lib/nof; do
+ sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libsupc++.la || true
+ sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libstdc++.la || true
+ done
}
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb cb054117aa91f7b4393fe9b091deb2bdd2a10494
+++ packages/gcc/gcc-cross_4.1.1.bb cfdd84524cbbd1e1c34dcde580d69028a2911e09
@@ -1,4 +1,4 @@
-PR = "r19"
+PR = "r20"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb b1163567031435869bb032598838e3e47eb8ea64
+++ packages/gcc/gcc-cross_4.1.2.bb 748e5c3cd4f91c91b8da804a00b7c4dbe4722ff3
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb 433bff967d743e14df01b1d904ef3fab59369639
+++ packages/gcc/gcc-cross_4.2.1.bb fc3f8ff824802c98b43d96daad8b3625ed7d7297
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb 1ed2f60e65e1b09e4a5637ab29c85ad02338061f
+++ packages/gcc/gcc-cross_4.2.2.bb 0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb 6cf8f04c1b793136fa18d9dd62e474f0d85ea003
+++ packages/gcc/gcc-cross_4.3.0.bb 4624dce6b1ba076d4ae2d489e5808e69f56fd1b9
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/linux/linux.inc 0525f17ddb97e53c1c7ec5e4875ece888e8cce26
+++ packages/linux/linux.inc 13b7e845fdd0aabc17bee1ece748e62ea7a565e5
@@ -23,7 +23,7 @@ KERNEL_DEVICETREE_mpc8323e-rdb = "arch/$
KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-KERNEL_DEVICETREE_haleakala = "arch/${ARCH}/boot/dts/haleakala.dts"
+KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts"
python __anonymous () {
============================================================
--- packages/linux/linux_2.6.25.bb 74f819b82816e9036853dba786fe74026211e25d
+++ packages/linux/linux_2.6.25.bb 7357de969e9609eeedf602d412814cadda96d7cb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
-DEFAULT_PREFERENCE_haleakala = "1"
+DEFAULT_PREFERENCE_kilauea = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
file://defconfig"
More information about the Openembedded-commits
mailing list