From 322c3b7c476d7ad146ec7579aaa853d3f687576d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Aug 2007 08:34:07 +0000 Subject: openmoko-terminal: fix PV --- packages/openmoko-apps/openmoko-terminal_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb index 9238bbd1eb..85e8ea777f 100644 --- a/packages/openmoko-apps/openmoko-terminal_svn.bb +++ b/packages/openmoko-apps/openmoko-terminal_svn.bb @@ -1,7 +1,7 @@ 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 -- cgit v1.2.3 From 6f7f237a4067891355df5f8379bd3cca39076c61 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Aug 2007 10:17:57 +0000 Subject: pkgconfig-native: reinstate default pref --- packages/pkgconfig/pkgconfig-native_0.22.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb index 5a5423058d..4481656d7a 100644 --- a/packages/pkgconfig/pkgconfig-native_0.22.bb +++ b/packages/pkgconfig/pkgconfig-native_0.22.bb @@ -2,6 +2,8 @@ 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 = "" @@ -11,4 +13,4 @@ do_configure() { libtoolize --force oe_runconf } - \ No newline at end of file + -- cgit v1.2.3 From 39246ac4dc1efaa5b59db8a5b75653e48d553072 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 6 Aug 2007 11:00:44 +0000 Subject: ixp4xx-kernel: built the ixp4xx-npe module into the kernel, so it can accept a microcode image found in an MTD partition --- packages/linux/ixp4xx-kernel/2.6.21/defconfig | 2 +- packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 56474d512a..0fbb58a561 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -885,7 +885,7 @@ CONFIG_TUN=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 diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index ff90bcb3b3..b0ba8ba787 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -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 -- cgit v1.2.3 From 2726e2e97adfbc8117559309e88dfa49baf847b2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 6 Aug 2007 11:02:55 +0000 Subject: slugos: Made sure the IXP modules are in the rootfs, and bumped the slugos revision in preparation for testing before a binary release --- conf/distro/include/slugos.inc | 2 +- packages/tasks/task-slugos.bb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index bb1605e41b..00b9440b1f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -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): diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index d2281bca17..21f1b551f5 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ 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 @@ kernel-module-pata-artop \ # Add modules required for Network support SLUGOS_STANDARD_RRECOMMENDS += "\ +kernel-module-mii \ +kernel-module-ixp4xx-mac \ +kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ " -- cgit v1.2.3 From 34ad3bf832bd78d0f8d26df56955ba76d18c1e6a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Aug 2007 11:42:09 +0000 Subject: zaurus: Rename included conf files to .inc --- conf/machine/akita.conf | 4 +-- conf/machine/c7x0.conf | 4 +-- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/zaurus-2.6.conf | 42 ------------------------------ conf/machine/include/zaurus-2.6.inc | 42 ++++++++++++++++++++++++++++++ conf/machine/include/zaurus-clamshell.conf | 13 --------- conf/machine/include/zaurus-clamshell.inc | 13 +++++++++ conf/machine/poodle.conf | 2 +- conf/machine/spitz.conf | 4 +-- conf/machine/tosa.conf | 2 +- 10 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 conf/machine/include/zaurus-2.6.conf create mode 100644 conf/machine/include/zaurus-2.6.inc delete mode 100644 conf/machine/include/zaurus-clamshell.conf create mode 100644 conf/machine/include/zaurus-clamshell.inc diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index fad73c53bf..de94f560f9 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@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" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 098d0526f0..6862a8095f 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@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" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 01a06b7c27..fa24a3281b 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf deleted file mode 100644 index ada838f0d6..0000000000 --- a/conf/machine/include/zaurus-2.6.conf +++ /dev/null @@ -1,42 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well - -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" - -MACHINE_KERNEL_VERSION = "2.6" - -ERASEBLOCKSIZE = "0x4000" -ERASEBLOCKSIZE_akita = "0x20000" - -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" - -IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" - -EXTRA_IMAGEDEPENDS += "zaurus-updater" - -IMAGE_FSTYPES ?= "jffs2 tar.gz" - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf - -SERIAL_CONSOLE = "115200 ttyS0" - -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" -MACHINE_FEATURES_append_tosa = " usbhost wifi " -MACHINE_FEATURES_append_akita = " usbhost " -MACHINE_FEATURES_append_spitz = " usbhost ext2 " - -MACHINE_EXTRA_RDEPENDS = "zaurusd" -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" -MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" -MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" - -GUI_MACHINE_CLASS = "bigscreen" -GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc new file mode 100644 index 0000000000..ada838f0d6 --- /dev/null +++ b/conf/machine/include/zaurus-2.6.inc @@ -0,0 +1,42 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.conf as well + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" + +MACHINE_KERNEL_VERSION = "2.6" + +ERASEBLOCKSIZE = "0x4000" +ERASEBLOCKSIZE_akita = "0x20000" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" + +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" + +EXTRA_IMAGEDEPENDS += "zaurus-updater" + +IMAGE_FSTYPES ?= "jffs2 tar.gz" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.conf + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +PCMCIA_MANAGER ?= "pcmciautils" + +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" +MACHINE_FEATURES_append_tosa = " usbhost wifi " +MACHINE_FEATURES_append_akita = " usbhost " +MACHINE_FEATURES_append_spitz = " usbhost ext2 " + +MACHINE_EXTRA_RDEPENDS = "zaurusd" +MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" +MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" +MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" +MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" + +GUI_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf deleted file mode 100644 index f66502eff1..0000000000 --- a/conf/machine/include/zaurus-clamshell.conf +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" - -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ - && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ - --eraseblock=${ERASEBLOCKSIZE} -l -p; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ - rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ - rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc new file mode 100644 index 0000000000..f66502eff1 --- /dev/null +++ b/conf/machine/include/zaurus-clamshell.inc @@ -0,0 +1,13 @@ +EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" + +IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ + && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=${ERASEBLOCKSIZE} -l -p; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a548f513d3..eee1edd53e 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,6 +2,6 @@ #@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" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 81c789dcc4..3199065606 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@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}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index ddaf6e03c9..83227ee0c4 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@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" -- cgit v1.2.3 From 266445616acc479196e1be02af1981ef7f3f4569 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Aug 2007 11:47:47 +0000 Subject: zaurus-2.6: Create an install kit when generating images (from bug #2690 with modifications) --- classes/image.bbclass | 3 +++ conf/machine/include/zaurus-2.6.inc | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/classes/image.bbclass b/classes/image.bbclass index 101b53307a..248ccab60b 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -58,6 +58,7 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb" 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 () { diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index ada838f0d6..a9702cfce2 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -40,3 +40,30 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" 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-.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/ +} -- cgit v1.2.3