[oe-commits] org.oe.dev merge of '84875aef79b13e95114cd19f24c98b10531b29a7'
thesing commit
oe at amethyst.openembedded.net
Fri Mar 28 20:36:34 UTC 2008
merge of '84875aef79b13e95114cd19f24c98b10531b29a7'
and 'cfb7d5ebc09f125eccc955d0f2a4c525cf083f94'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: fc0bc62df59a686ca138444e96d044e81892a6c8
ViewMTN: http://monotone.openembedded.org/revision/info/fc0bc62df59a686ca138444e96d044e81892a6c8
Files:
1
conf/machine/include/zaurus-2.6.inc
packages/keymaps/files/collie/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp.inc
classes/kernel-arch.bbclass
classes/kernel.bbclass
classes/packaged-staging.bbclass
packages/linux/linux.inc
Diffs:
#
# mt diff -r84875aef79b13e95114cd19f24c98b10531b29a7 -rfc0bc62df59a686ca138444e96d044e81892a6c8
#
#
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [ec1dccd443e27cabd637f308fbaa647b5ea3286b]
# to [f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6]
#
# patch "packages/keymaps/files/collie/keymap-2.6.map"
# from [9ae351dfb21f9a85ee2f904e947faa5073a26a34]
# to [eed7b56b0554b75a738cbe71c889555c1cc7dc8e]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [30c7477adcffd4ee16488b6541923f63e618f258]
# to [3ca60513019e86146c6189d1b3436b35b168c96b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
# from [cdc131302bb2f166b54297d964f87b3c6b153bad]
# to [00f12162c27b673416c405423b28120b2a874dfe]
#
# patch "packages/linux/linux-rp.inc"
# from [3a2d5b9393fe2992f9997c380afb0b845c4b7e8b]
# to [34e86573113cf36780881ec8485b18635c751427]
#
============================================================
--- conf/machine/include/zaurus-2.6.inc ec1dccd443e27cabd637f308fbaa647b5ea3286b
+++ conf/machine/include/zaurus-2.6.inc f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6
@@ -33,7 +33,8 @@ MACHINE_EXTRA_RRECOMMENDS_collie = "kern
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
- kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi"
+ kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
+ kernel-module-power"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_collie = "smallscreen"
============================================================
--- packages/keymaps/files/collie/keymap-2.6.map 9ae351dfb21f9a85ee2f904e947faa5073a26a34
+++ packages/keymaps/files/collie/keymap-2.6.map eed7b56b0554b75a738cbe71c889555c1cc7dc8e
@@ -154,7 +154,8 @@ keycode 57 = space
control keycode 57 = nul
shiftl control keycode 57 = grave
control shiftr keycode 57 = grave
-keycode 67 = Control
+keycode 67 = Control
+keycode 87 = Return
keycode 99 = Control_backslash
control keycode 99 = Control_backslash
keycode 100 = AltGr
============================================================
--- packages/keymaps/keymaps_1.0.bb 30c7477adcffd4ee16488b6541923f63e618f258
+++ packages/keymaps/keymaps_1.0.bb 3ca60513019e86146c6189d1b3436b35b168c96b
@@ -3,7 +3,7 @@ PACKAGE_ARCH = "${MACHINE}"
RDEPENDS = "initscripts console-tools"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE}"
-PR = "r18"
+PR = "r19"
inherit update-rc.d
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-collie cdc131302bb2f166b54297d964f87b3c6b153bad
+++ packages/linux/linux-rp-2.6.24/defconfig-collie 00f12162c27b673416c405423b28120b2a874dfe
@@ -857,8 +857,8 @@ CONFIG_MCP_UCB1200=y
CONFIG_MCP=y
CONFIG_MCP_SA11X0=y
CONFIG_MCP_UCB1200=y
-CONFIG_MCP_UCB1200_TS=m
-# CONFIG_MCP_COLLIE_TS is not set
+# CONFIG_MCP_UCB1200_TS is not set
+CONFIG_MCP_COLLIE_TS=m
#
# Multimedia devices
============================================================
--- packages/linux/linux-rp.inc 3a2d5b9393fe2992f9997c380afb0b845c4b7e8b
+++ packages/linux/linux-rp.inc 34e86573113cf36780881ec8485b18635c751427
@@ -63,9 +63,8 @@ module_autoload_leds-locomo_collie = "le
module_autoload_sa1100-cs_collie = "sa1100_cs"
module_autoload_collie-ts_collie = "collie-ts"
module_autoload_leds-locomo_collie = "leds-locomo"
-module_autoload_unix_collie = "unix"
+module_autoload_power_collie = "power"
-
do_configure() {
rm -f ${S}/.config
#
# mt diff -rcfb7d5ebc09f125eccc955d0f2a4c525cf083f94 -rfc0bc62df59a686ca138444e96d044e81892a6c8
#
#
#
# patch "classes/kernel-arch.bbclass"
# from [bc087fcf76549ca28fef463566ac9a3f46a3d703]
# to [a483a48991725bddaa414801e036e80ca754b603]
#
# patch "classes/kernel.bbclass"
# from [b6e05ecebbfd152cbd0c654bcea62bbcf8f18352]
# to [56eee918e2285b8298e9e2feecc353c0723683aa]
#
# patch "classes/packaged-staging.bbclass"
# from [569c1cd9a850336fcc5f596fc1e32a5f8252576c]
# to [af2dc7a8ccc45ac795724160291eddb776b619b5]
#
# patch "packages/linux/linux.inc"
# from [05a28f69ba86f2b970e011440a9296697b6e57d8]
# to [0196432d82c97552c01b010a212e24c2a8b0016a]
#
============================================================
--- classes/kernel-arch.bbclass bc087fcf76549ca28fef463566ac9a3f46a3d703
+++ classes/kernel-arch.bbclass a483a48991725bddaa414801e036e80ca754b603
@@ -30,3 +30,11 @@ export ARCH = "${@map_kernel_arch(bb.dat
bb.error("cannot map '%s' to a linux kernel architecture" % a)
export ARCH = "${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)}"
+
+def map_uboot_arch(a, d):
+ if a == "powerpc":
+ return "ppc"
+ return a
+
+export UBOOT_ARCH = "${@map_uboot_arch(bb.data.getVar('ARCH', d, 1), d)}"
+
============================================================
--- classes/kernel.bbclass b6e05ecebbfd152cbd0c654bcea62bbcf8f18352
+++ classes/kernel.bbclass 56eee918e2285b8298e9e2feecc353c0723683aa
@@ -475,13 +475,13 @@ do_deploy() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
- uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
rm -f linux.bin
else
${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
- uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
rm -f linux.bin.gz
fi
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
============================================================
--- classes/packaged-staging.bbclass 569c1cd9a850336fcc5f596fc1e32a5f8252576c
+++ classes/packaged-staging.bbclass af2dc7a8ccc45ac795724160291eddb776b619b5
@@ -257,10 +257,8 @@ python do_package_stage () {
if len(packages) > 0:
if bb.data.inherits_class('package_ipk', d):
ipkpath = bb.data.getVar('DEPLOY_DIR_IPK', d, True).replace(tmpdir, stagepath)
- bb.mkdirhier(ipkpath)
if bb.data.inherits_class('package_deb', d):
debpath = bb.data.getVar('DEPLOY_DIR_DEB', d, True).replace(tmpdir, stagepath)
- bb.mkdirhier(debpath)
for pkg in packages:
pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
@@ -279,7 +277,10 @@ python do_package_stage () {
srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d)
if not os.path.exists(srcfile):
bb.fatal("Package %s does not exist yet it should" % srcfile)
- bb.copyfile(srcfile, ipkpath + "/" + srcname)
+ destpath = ipkpath + "/" + arch + "/"
+ bb.mkdirhier(destpath)
+ bb.copyfile(srcfile, destpath + srcname)
+
if bb.data.inherits_class('package_deb', d):
if arch == 'all':
srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_all.deb", d)
@@ -288,7 +289,9 @@ python do_package_stage () {
srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d)
if not os.path.exists(srcfile):
bb.fatal("Package %s does not exist yet it should" % srcfile)
- bb.copyfile(srcfile, debpath + "/" + srcname)
+ destpath = debpath + "/" + arch + "/"
+ bb.mkdirhier(destpath)
+ bb.copyfile(srcfile, destpath + srcname)
#
# Handle stamps/ files
============================================================
--- packages/linux/linux.inc 05a28f69ba86f2b970e011440a9296697b6e57d8
+++ packages/linux/linux.inc 0196432d82c97552c01b010a212e24c2a8b0016a
@@ -90,17 +90,8 @@ do_configure_append_avr32() {
sed -i -e s:-mno-pic::g arch/avr32/Makefile
}
-
-UBOOT_ENTRYPOINT ?= "20008000"
-UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
-
do_compile_append() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
- if test "x${ARCH}" = "xpowerpc" ; then
- UBOOT_ARCH=ppc
- else
- UBOOT_ARCH=$ARCH
- fi
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
More information about the Openembedded-commits
mailing list