[oe-commits] org.oe.dev merge of '112f00d072dac9a989e6b502c04819e4f2a2be86'
ifaistos commit
openembedded-commits at lists.openembedded.org
Mon Aug 6 12:08:04 UTC 2007
merge of '112f00d072dac9a989e6b502c04819e4f2a2be86'
and 'bd74f0d95f3b638b0b4131cb4eb597be6b3b4198'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 611bfe4d6e620cea4d216e318144b7394bd7d322
ViewMTN: http://monotone.openembedded.org/revision.psp?id=611bfe4d6e620cea4d216e318144b7394bd7d322
Files:
1
conf/machine/include/zaurus-2.6.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.conf
conf/machine/include/zaurus-clamshell.inc
classes/image.bbclass
conf/distro/include/slugos.inc
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/include/poodle-2.6.conf
conf/machine/poodle.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/openmoko-apps/openmoko-terminal_svn.bb
packages/pkgconfig/pkgconfig-native_0.22.bb
packages/tasks/task-slugos.bb
packages/xorg-lib/libx11_1.1.2.bb
Diffs:
#
# mt diff -r112f00d072dac9a989e6b502c04819e4f2a2be86 -r611bfe4d6e620cea4d216e318144b7394bd7d322
#
#
#
# rename "conf/machine/include/zaurus-2.6.conf"
# to "conf/machine/include/zaurus-2.6.inc"
#
# rename "conf/machine/include/zaurus-clamshell.conf"
# to "conf/machine/include/zaurus-clamshell.inc"
#
# patch "classes/image.bbclass"
# from [ce0f0d35208d7dd219730207d787be86751416c5]
# to [6bfd73489be48ca3395112458e8092971909dc82]
#
# patch "conf/distro/include/slugos.inc"
# from [e2b01734de8b2e6dca970ce26b4168e0b7fa033c]
# to [dd3fea4cb57defe36baa89ffab3a41ff6fd04c71]
#
# patch "conf/machine/akita.conf"
# from [a569abe245fc480d760d62af1ecca91ca5f54185]
# to [2df3dcb96666cf8cfca46aa0e7decce2a2a0fa1f]
#
# patch "conf/machine/c7x0.conf"
# from [8d2be52a9581ba26cf2333e9e215680c57b36336]
# to [7638510804028bd9403ca89524f98750881846ab]
#
# patch "conf/machine/include/poodle-2.6.conf"
# from [dbb8e56d2ba45d4a843e5f929ecd14b70aa24633]
# to [d42d8f878e688ed3229fec4a7ae5af793c12b631]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [08f890e9c168eb62bf5bb23912bd916c209271ed]
# to [72f56a86eaabe41773f1417f2934a7ed5a2b288b]
#
# patch "conf/machine/poodle.conf"
# from [3b5c0685355ea21e05c2ab652753d1a261c9c398]
# to [0b40f507ee0f80a83a9a703e3d6eda6a5809bcdb]
#
# patch "conf/machine/spitz.conf"
# from [fb942cabc090e6ba0dd98dc4a57d07867813a6ed]
# to [f3d290ba190219e5b8c3accc84c10a6b44980827]
#
# patch "conf/machine/tosa.conf"
# from [6c59a88ddb8ab5b419264c1a4d2f172bd7ba76c3]
# to [54214b8163032fe25dd47a730267cd2c643d74cb]
#
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
# from [2066088fb6f08b47ace0f9b1b4755bc9ea14fed6]
# to [b30e7150607fae97b5c6688d3f4ba07220c743ed]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [4c21f111521b327915ac064d09fa63c6d1b1891b]
# to [f2a691df6724055699f734d3ccbd5cd557658115]
#
# patch "packages/openmoko-apps/openmoko-terminal_svn.bb"
# from [5b909c837b04c515be7224d5aac6d622a8c27550]
# to [048f50ee60767a9080fbe91671ac0006d633b258]
#
# patch "packages/pkgconfig/pkgconfig-native_0.22.bb"
# from [fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd]
# to [c5f805f586288da9b9111d6f554546a067473283]
#
# patch "packages/tasks/task-slugos.bb"
# from [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
# to [a87c962b09a3b4d79d70e7d24e3702d49e347f3c]
#
============================================================
--- classes/image.bbclass ce0f0d35208d7dd219730207d787be86751416c5
+++ classes/image.bbclass 6bfd73489be48ca3395112458e8092971909dc82
@@ -58,6 +58,7 @@ ROOTFS_POSTPROCESS_COMMAND ?= ""
LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
ROOTFS_POSTPROCESS_COMMAND ?= ""
+MACHINE_POSTPROCESS_COMMAND ?= ""
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
@@ -100,6 +101,8 @@ fakeroot do_rootfs () {
done
${IMAGE_POSTPROCESS_COMMAND}
+
+ ${MACHINE_POSTPROCESS_COMMAND}
}
insert_feed_uris () {
============================================================
--- conf/distro/include/slugos.inc e2b01734de8b2e6dca970ce26b4168e0b7fa033c
+++ conf/distro/include/slugos.inc dd3fea4cb57defe36baa89ffab3a41ff6fd04c71
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.4"
+SLUGOS_VERSION = "4.5"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
============================================================
--- conf/machine/akita.conf a569abe245fc480d760d62af1ecca91ca5f54185
+++ conf/machine/akita.conf 2df3dcb96666cf8cfca46aa0e7decce2a2a0fa1f
@@ -1,9 +1,9 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PACKAGE_EXTRA_ARCHS += "iwmmxt"
============================================================
--- conf/machine/c7x0.conf 8d2be52a9581ba26cf2333e9e215680c57b36336
+++ conf/machine/c7x0.conf 7638510804028bd9403ca89524f98750881846ab
@@ -1,9 +1,9 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
IMAGE_FSTYPES ?= "jffs2"
============================================================
--- conf/machine/include/poodle-2.6.conf dbb8e56d2ba45d4a843e5f929ecd14b70aa24633
+++ conf/machine/include/poodle-2.6.conf d42d8f878e688ed3229fec4a7ae5af793c12b631
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
============================================================
--- conf/machine/include/zaurus-2.6.conf 08f890e9c168eb62bf5bb23912bd916c209271ed
+++ conf/machine/include/zaurus-2.6.inc 72f56a86eaabe41773f1417f2934a7ed5a2b288b
@@ -40,3 +40,30 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir ${IMAGE_NAME}-installkit/
+
+ # Get the latest kernel using the zImage-<machine>.bin symlink
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+ if [ "${MACHINE}" = "spitz" ]; then
+ cp gnu-tar ${IMAGE_NAME}-installkit/
+ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+ else
+ cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+ fi
+
+ # All zaurus machines except collie need updater.sh
+ if [ "${MACHINE}" != "collie" ]; then
+ cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+ fi
+
+ tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
============================================================
--- conf/machine/poodle.conf 3b5c0685355ea21e05c2ab652753d1a261c9c398
+++ conf/machine/poodle.conf 0b40f507ee0f80a83a9a703e3d6eda6a5809bcdb
@@ -1,7 +1,7 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
ROOT_FLASH_SIZE = "22"
============================================================
--- conf/machine/spitz.conf fb942cabc090e6ba0dd98dc4a57d07867813a6ed
+++ conf/machine/spitz.conf f3d290ba190219e5b8c3accc84c10a6b44980827
@@ -1,9 +1,9 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-C3000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
============================================================
--- conf/machine/tosa.conf 6c59a88ddb8ab5b419264c1a4d2f172bd7ba76c3
+++ conf/machine/tosa.conf 54214b8163032fe25dd47a730267cd2c643d74cb
@@ -1,8 +1,8 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-6000
#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
# newer kernels does not build
PREFERRED_VERSION_linux-rp = "2.6.17"
============================================================
--- packages/linux/ixp4xx-kernel/2.6.21/defconfig 2066088fb6f08b47ace0f9b1b4755bc9ea14fed6
+++ packages/linux/ixp4xx-kernel/2.6.21/defconfig b30e7150607fae97b5c6688d3f4ba07220c743ed
@@ -885,7 +885,7 @@ CONFIG_IXP4XX_QMGR=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
CONFIG_IXP4XX_QMGR=m
-CONFIG_IXP4XX_NPE=m
+CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_NPE_FW_LOAD=y
CONFIG_IXP4XX_NPE_FW_MTD=y
CONFIG_IXP4XX_MAC=m
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.6.bb 4c21f111521b327915ac064d09fa63c6d1b1891b
+++ packages/linux/ixp4xx-kernel_2.6.21.6.bb f2a691df6724055699f734d3ccbd5cd557658115
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "914"
+IXP4XX_KERNEL_SVN_REV = "915"
#
# The directory containing the patches to be applied is
# specified below
============================================================
--- packages/openmoko-apps/openmoko-terminal_svn.bb 5b909c837b04c515be7224d5aac6d622a8c27550
+++ packages/openmoko-apps/openmoko-terminal_svn.bb 048f50ee60767a9080fbe91671ac0006d633b258
@@ -1,7 +1,7 @@ RDEPENDS += "gtkterm2"
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "gtkterm2"
-PV = "1.0.0+svn${SRCDATE}"
+PV = "1.0.0"
PR = "r1"
inherit openmoko
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd
+++ packages/pkgconfig/pkgconfig-native_0.22.bb c5f805f586288da9b9111d6f554546a067473283
@@ -1,7 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
SECTION = "console/utils"
require pkgconfig.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+DEFAULT_PREFERENCE = "-1"
+
S = "${WORKDIR}/pkg-config-${PV}/"
inherit native
DEPENDS = ""
============================================================
--- packages/tasks/task-slugos.bb b17910995413514e0b7ea24f7ea3468dd3c2d63e
+++ packages/tasks/task-slugos.bb a87c962b09a3b4d79d70e7d24e3702d49e347f3c
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -92,6 +92,9 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
# Add modules required for Network support
SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
kernel-module-via-velocity \
"
#
# mt diff -rbd74f0d95f3b638b0b4131cb4eb597be6b3b4198 -r611bfe4d6e620cea4d216e318144b7394bd7d322
#
#
#
# patch "packages/xorg-lib/libx11_1.1.2.bb"
# from [e93d3e6090cf94bb514343ddbf2cd6c114b7ef2b]
# to [72fc7fde07ba2a58ea79355937eb2f6e1c0495be]
#
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb e93d3e6090cf94bb514343ddbf2cd6c114b7ef2b
+++ packages/xorg-lib/libx11_1.1.2.bb 72fc7fde07ba2a58ea79355937eb2f6e1c0495be
@@ -5,17 +5,19 @@ PE = "1"
libxdmcp xf86bigfontproto kbproto inputproto"
PROVIDES = "virtual/libx11"
PE = "1"
+PR = "r1"
XORG_PN = "libX11"
EXTRA_OECONF += "--without-xcb"
do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- oe_runmake
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
}
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
More information about the Openembedded-commits
mailing list