[oe-commits] org.oe.dev merge of '0092188379e9f72acfeb7af2b132c12554d8a515'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:44:45 UTC 2007
merge of '0092188379e9f72acfeb7af2b132c12554d8a515'
and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 7092ab793b40d9bf0352adda7cb0de9e9d1b53d9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7092ab793b40d9bf0352adda7cb0de9e9d1b53d9
Files:
1
packages/libftdi/libftdi-native_0.8.bb
packages/libftdi/libftdi_0.8.bb
packages/s3c2410-utils/files
packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2
packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2
packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb
packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
packages/gaim/pidgin_2.0.1.bb
packages/gaim/pidgin_2.0.2.bb
packages/xorg-lib/libx11/ruutf8.patch
packages/xorg-lib/files/ruutf8.patch
packages/initscripts/initscripts-1.0/fic-gta01
packages/libid3
packages/openocd/files
packages/sidplay-base
conf/machine/fic-gta02.conf
packages/initscripts/initscripts-1.0/fic-gta01/inittab
packages/libftdi/libftdi-native_0.9.bb
packages/libftdi/libftdi_0.9.bb
packages/libid3/libid3_1.1.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb
packages/openocd/files/openocd-link-static.patch
packages/sidplay-base/sidplay-base_1.0.9.bb
conf/distro/angstrom-2007.1.conf
conf/machine/fic-gta01.conf
contrib/python/generate-manifest.py
packages/initscripts/initscripts_1.0.bb
packages/irssi/irssi_svn.bb
packages/libftdi/files/doxygen-configure.patch
packages/openocd/openocd-native_svn.bb
packages/openocd/openocd_svn.bb
packages/python/python-2.4.4-manifest.inc
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-dsmg600.h
Diffs:
#
# mt diff -r0092188379e9f72acfeb7af2b132c12554d8a515 -r7092ab793b40d9bf0352adda7cb0de9e9d1b53d9
#
#
#
# delete "packages/libftdi/libftdi-native_0.8.bb"
#
# delete "packages/libftdi/libftdi_0.8.bb"
#
# delete "packages/s3c2410-utils/files"
#
# delete "packages/s3c2410-utils/files/s3c2410_boot_usb-20060807.tar.bz2"
#
# delete "packages/s3c2410-utils/files/sjf2410-linux-20060807.tar.bz2"
#
# delete "packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb"
#
# delete "packages/s3c2410-utils/sjf2410-linux-native_20060807.bb"
#
# rename "packages/gaim/pidgin_2.0.1.bb"
# to "packages/gaim/pidgin_2.0.2.bb"
#
# rename "packages/xorg-lib/libx11/ruutf8.patch"
# to "packages/xorg-lib/files/ruutf8.patch"
#
# add_dir "packages/initscripts/initscripts-1.0/fic-gta01"
#
# add_dir "packages/libid3"
#
# add_dir "packages/openocd/files"
#
# add_dir "packages/sidplay-base"
#
# add_file "conf/machine/fic-gta02.conf"
# content [f432dd6889c55c316032a7acbf4d55670603e3e1]
#
# add_file "packages/initscripts/initscripts-1.0/fic-gta01/inittab"
# content [5e7dbcf2eab7f08defd62b30f6b48930515c5234]
#
# add_file "packages/libftdi/libftdi-native_0.9.bb"
# content [e606fa1e5a73fb6e4ac05018acff07c955ec7bbd]
#
# add_file "packages/libftdi/libftdi_0.9.bb"
# content [080df851d8fe425c65691b290fbe007211c4754f]
#
# add_file "packages/libid3/libid3_1.1.bb"
# content [988ba101e3cf7752ee5116a60ec5c0bd1a1031f7]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# add_file "packages/openocd/files/openocd-link-static.patch"
# content [6d79715a25d82a8f072733a55322b9adadff0989]
#
# add_file "packages/sidplay-base/sidplay-base_1.0.9.bb"
# content [b8aa1d3fb1053fb42cfd85771aec54c8f20361cf]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [105f06c8d025e2bb135bdaaab2b32de263fd618e]
# to [debe17f3dff6a267123f8b0908ce7070862a0d8d]
#
# patch "conf/machine/fic-gta01.conf"
# from [b92c864d740c2732b3d2343f6b98a9551d71d7dc]
# to [d56f1f82dbbb488e26ee4937693060e3d26c9edb]
#
# patch "contrib/python/generate-manifest.py"
# from [b03bd75fd3e29df6ef2dad709cc6a59a1035678a]
# to [fc5557c7229ed48a1697f1c02eaa427e772c5096]
#
# patch "packages/gaim/pidgin_2.0.2.bb"
# from [26ef9bd185fb1020b6937ba578679c973d95b033]
# to [f38dd9af51ab37706164482bcece1477daca655a]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [d1337b7efc5158feab278f23b35fb9d91519c2ca]
# to [4c63ef69c0db9d16925152166514d1c34825a6cb]
#
# patch "packages/irssi/irssi_svn.bb"
# from [e6517c6e4cb3f726bec7ec64aad6f54dc880f88d]
# to [eb181fc01e38d297697f8b2d23161c658fc6f6e2]
#
# patch "packages/libftdi/files/doxygen-configure.patch"
# from [7e579a629aba8452e9a0b794d1004e8cfe4ac7bc]
# to [2d1408cf9eb635cbbb2fd93b76595be4b03abaee]
#
# patch "packages/openocd/openocd-native_svn.bb"
# from [7707b077956b6bbee315e898e7bfc57fed20648a]
# to [b8df1c3c4be21f505f7af19f6847682f34a5d9c1]
#
# patch "packages/openocd/openocd_svn.bb"
# from [ace5e5434883004092e4c718ed6c79d1f05bfe9c]
# to [db913b69369bbce05c7db34eda5b089de8836bfe]
#
# patch "packages/python/python-2.4.4-manifest.inc"
# from [5fd60f6dfbf52c479351b3c1d55c494e5e325569]
# to [b0214b4ddca7cee82b002cc188103d4585f961de]
#
============================================================
--- conf/machine/fic-gta02.conf f432dd6889c55c316032a7acbf4d55670603e3e1
+++ conf/machine/fic-gta02.conf f432dd6889c55c316032a7acbf4d55670603e3e1
@@ -0,0 +1,38 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: FIC GTA02 (Neo1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
+
+# package gta01 specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-gta01-pm-bt \
+ kernel-module-gta01-pm-gps \
+ kernel-module-gta01-pm-gsm \
+ kernel-module-gta01kbd \
+ kernel-module-s3cmci \
+ kernel-module-ext2 \
+ alsa-state"
+
+SERIAL_CONSOLE = "115200 ttySAC2"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+
+# build tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+
+# tune for S3C24x0
+include conf/machine/include/tune-arm920t.conf
============================================================
--- packages/initscripts/initscripts-1.0/fic-gta01/inittab 5e7dbcf2eab7f08defd62b30f6b48930515c5234
+++ packages/initscripts/initscripts-1.0/fic-gta01/inittab 5e7dbcf2eab7f08defd62b30f6b48930515c5234
@@ -0,0 +1,48 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:5:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# Shut down if kernel sends us SIGINT or SIGPWR
+ca::ctrlaltdel:/sbin/halt -p
+pf::powerfailnow:/sbin/halt -p
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+# <id>:<runlevels>:<action>:<process>
+
+# NOTE: FIC GTA01 has this odd multiplexer on ttySAC0 since
+# GSM shares it with the serial output. We only allow
+# the getty in runlevel 2 to cope with that. gsmd gets
+# started in runlevel 3. -- mickey at openmoko.org
+S:2:respawn:/sbin/getty 115200 ttySAC0
============================================================
--- packages/libftdi/libftdi-native_0.9.bb e606fa1e5a73fb6e4ac05018acff07c955ec7bbd
+++ packages/libftdi/libftdi-native_0.9.bb e606fa1e5a73fb6e4ac05018acff07c955ec7bbd
@@ -0,0 +1,5 @@
+require libftdi_${PV}.bb
+
+inherit native
+
+DEPENDS = "libusb-native"
============================================================
--- packages/libftdi/libftdi_0.9.bb 080df851d8fe425c65691b290fbe007211c4754f
+++ packages/libftdi/libftdi_0.9.bb 080df851d8fe425c65691b290fbe007211c4754f
@@ -0,0 +1,17 @@
+DESCRIPTION = "libftdi is a library (using libusb) to talk to FTDI's \
+FT232BM, FT245BM and FT2232C type chips including the popular bitbang mode."
+HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi"
+LICENSE = "GPL"
+DEPENDS = "libusb"
+
+SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
+ file://doxygen-configure.patch;patch=1"
+S = "${WORKDIR}/libftdi-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-docs"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/libid3/libid3_1.1.bb 988ba101e3cf7752ee5116a60ec5c0bd1a1031f7
+++ packages/libid3/libid3_1.1.bb 988ba101e3cf7752ee5116a60ec5c0bd1a1031f7
@@ -0,0 +1,13 @@
+DESCRIPTION = "libID3 is a small C library to parse ID3 tags. \
+It uses as little memory as possible, and has both DOM- and SAX-like models."
+SECTION = "libs/multimedia"
+LICENSE = "LGPL"
+
+SRC_URI = "http://download.tangent.org/libid3-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh9.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/openocd/files/openocd-link-static.patch 6d79715a25d82a8f072733a55322b9adadff0989
+++ packages/openocd/files/openocd-link-static.patch 6d79715a25d82a8f072733a55322b9adadff0989
@@ -0,0 +1,20 @@
+--- openocd/src/Makefile.am.orig 2007-03-01 11:51:41.000000000 -0300
++++ openocd/src/Makefile.am 2007-03-01 11:58:08.000000000 -0300
+@@ -7,7 +7,7 @@
+ -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
+
+ # the library search path.
+-openocd_LDFLAGS = $(all_libraries)
++openocd_LDFLAGS = -static $(all_libraries)
+ SUBDIRS = helper jtag xsvf target server flash pld
+
+ if IS_MINGW
+@@ -17,7 +17,7 @@
+ endif
+
+ if FT2232_LIBFTDI
+-FTDI2232LIB = -lftdi
++FTDI2232LIB = -lftdi -lusb
+ else
+ FTDI2232LIB =
+ endif
============================================================
--- packages/sidplay-base/sidplay-base_1.0.9.bb b8aa1d3fb1053fb42cfd85771aec54c8f20361cf
+++ packages/sidplay-base/sidplay-base_1.0.9.bb b8aa1d3fb1053fb42cfd85771aec54c8f20361cf
@@ -0,0 +1,10 @@
+DESCRIPTION = "A spartanic SID music player based on libsidplay 1.x"
+SECTION = "console/multimedia"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html"
+DEPENDS = "libsidplay"
+
+SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/sidplay-base-${PV}.tgz"
+S = "${WORKDIR}/sidplay-base-${PV}"
+
+inherit autotools
============================================================
--- conf/distro/angstrom-2007.1.conf 105f06c8d025e2bb135bdaaab2b32de263fd618e
+++ conf/distro/angstrom-2007.1.conf debe17f3dff6a267123f8b0908ce7070862a0d8d
@@ -124,7 +124,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh8"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh9"
PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
============================================================
--- conf/machine/fic-gta01.conf b92c864d740c2732b3d2343f6b98a9551d71d7dc
+++ conf/machine/fic-gta01.conf d56f1f82dbbb488e26ee4937693060e3d26c9edb
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -23,7 +23,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-ext2 \
alsa-state"
-# used by sysvinit_2
+# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
#SERIAL_CONSOLE = "115200 ttySAC0"
# used by some images
============================================================
--- contrib/python/generate-manifest.py b03bd75fd3e29df6ef2dad709cc6a59a1035678a
+++ contrib/python/generate-manifest.py fc5557c7229ed48a1697f1c02eaa427e772c5096
@@ -10,7 +10,7 @@ VERSION = "2.4.4"
VERSION = "2.4.4"
# increase when touching python-core
-BASEREV = 1
+BASEREV = 2
__author__ = "Michael 'Mickey' Lauer <mickey at Vanille.de>"
__version__ = "20070721"
@@ -158,7 +158,7 @@ if __name__ == "__main__":
"lib/python2.4/lib-dynload/binascii.so lib/python2.4/lib-dynload/struct.so lib/python2.4/lib-dynload/time.so " +
"lib/python2.4/lib-dynload/xreadlines.so lib/python2.4/types.* bin/python*" )
- m.addPackage( 0, "python-core-debug", "Python core module debug information", "python-core",
+ m.addPackage( 0, "python-core-dbg", "Python core module debug information", "python-core",
"lib/python2.4/lib-dynload/.debug bin/.debug lib/.debug" )
m.addPackage( 0, "python-devel", "Python Development Package", "python-core",
============================================================
--- packages/gaim/pidgin_2.0.1.bb 26ef9bd185fb1020b6937ba578679c973d95b033
+++ packages/gaim/pidgin_2.0.2.bb f38dd9af51ab37706164482bcece1477daca655a
@@ -6,4 +6,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/
file://pidgin.desktop-set-icon.patch;patch=1 \
"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/initscripts/initscripts_1.0.bb d1337b7efc5158feab278f23b35fb9d91519c2ca
+++ packages/initscripts/initscripts_1.0.bb 4c63ef69c0db9d16925152166514d1c34825a6cb
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "SysV init scripts"
SECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r93"
+PR = "r94"
SRC_URI = "file://halt \
file://ramdisk \
============================================================
--- packages/irssi/irssi_svn.bb e6517c6e4cb3f726bec7ec64aad6f54dc880f88d
+++ packages/irssi/irssi_svn.bb eb181fc01e38d297697f8b2d23161c658fc6f6e2
@@ -6,6 +6,8 @@ PR = "r3"
PV = "0.8.10+svn${SRCDATE}"
PR = "r3"
+DEFAULT_PREFERENCE = "-1"
+
PACKAGES += "${PN}-common"
FILES_${PN} = "${bindir}/irssi"
FILES_${PN}-common = "${datadir}/irssi ${sysconfdir}"
============================================================
--- packages/libftdi/files/doxygen-configure.patch 7e579a629aba8452e9a0b794d1004e8cfe4ac7bc
+++ packages/libftdi/files/doxygen-configure.patch 2d1408cf9eb635cbbb2fd93b76595be4b03abaee
@@ -1,22 +1,22 @@
-Index: libftdi-0.8/configure.in
+Index: libftdi-0.9/configure.in
===================================================================
---- libftdi-0.8.orig/configure.in
-+++ libftdi-0.8/configure.in
+--- libftdi-0.9.orig/configure.in
++++ libftdi-0.9/configure.in
@@ -32,9 +32,5 @@ else
AC_MSG_RESULT(yes)
fi
-dnl check for doxygen
--AC_PATH_PROG(DOXYGEN, doxygen, $PATH)
+-AC_PATH_PROG(DOXYGEN, doxygen)
-AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN);
-
AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
-AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc)
+AC_OUTPUT(Makefile src/Makefile examples/Makefile libftdi.pc)
-Index: libftdi-0.8/Makefile.am
+Index: libftdi-0.9/Makefile.am
===================================================================
---- libftdi-0.8.orig/Makefile.am
-+++ libftdi-0.8/Makefile.am
+--- libftdi-0.9.orig/Makefile.am
++++ libftdi-0.9/Makefile.am
@@ -2,7 +2,7 @@
# have all needed files, that a GNU package needs
AUTOMAKE_OPTIONS = foreign 1.4
============================================================
--- packages/openocd/openocd-native_svn.bb 7707b077956b6bbee315e898e7bfc57fed20648a
+++ packages/openocd/openocd-native_svn.bb b8df1c3c4be21f505f7af19f6847682f34a5d9c1
@@ -1,10 +1,17 @@ DEPENDS = "libftdi-native"
require openocd_${PV}.bb
inherit native
DEPENDS = "libftdi-native"
+EXTRA_OECONF = "--enable-ft2232_libftdi --enable-parport-ppdev"
do_stage() {
- install -m 0755 src/openocd ${STAGING_BINDIR}
+ install -m 0755 src/openocd ${STAGING_BINDIR_NATIVE}
}
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
+}
+
+addtask deploy before do_package after do_install
============================================================
--- packages/openocd/openocd_svn.bb ace5e5434883004092e4c718ed6c79d1f05bfe9c
+++ packages/openocd/openocd_svn.bb db913b69369bbce05c7db34eda5b089de8836bfe
@@ -1,14 +1,12 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
HOMEPAGE = "http://openocd.berlios.de/"
LICENSE = "GPL"
PV = "0.0+svn${SRCDATE}"
-DEPENDS = "libftdi"
+inherit autotools
-SRC_URI = "svn://svn.berlios.de/;module=openocd"
+SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
+ file://openocd-link-static.patch;patch=1"
+S = "${WORKDIR}/trunk"
+EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx"
-S = "${WORKDIR}/openocd/trunk"
-
-inherit autotools
-
-EXTRA_OECONF =%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re89c096197c1edb468e2fa9e49482a06b639bf1e -r7092ab793b40d9bf0352adda7cb0de9e9d1b53d9
#
#
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [03183c3151029ae4353feb0d5f2cafdbc9bfbe49]
# to [363539e6aa9b48b4075ef6f22841c250058075ba]
#
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
# from [d00909cd9a1463bc0408385eccc82a7aabbdb7f4]
# to [e1e4b562c2e75b563db67b4f23659eb5d2586f41]
#
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 03183c3151029ae4353feb0d5f2cafdbc9bfbe49
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 363539e6aa9b48b4075ef6f22841c250058075ba
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "ARM Kernel Shim"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h d00909cd9a1463bc0408385eccc82a7aabbdb7f4
+++ packages/arm-kernel-shim/files/config-dsmg600.h e1e4b562c2e75b563db67b4f23659eb5d2586f41
@@ -18,6 +18,8 @@
#define MACH_TYPE 964
+#define GUARANTEE_ATAG_CMDLINE
+
/* Uncomment one of these to switch the CPU into a specific mode. */
//#define FORCE_LITTLEENDIAN
//#define FORCE_BIGENDIAN
More information about the Openembedded-commits
mailing list