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(-) (limited to 'packages') 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(-) (limited to 'packages') 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(-) (limited to 'packages') 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 --- packages/tasks/task-slugos.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') 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