diff options
| author | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-08-06 11:58:19 +0000 |
|---|---|---|
| committer | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-08-06 11:58:19 +0000 |
| commit | 50c18df5bec2aabd3ddcb8ea2219c3e170e3bb8e (patch) | |
| tree | 8a441fcc1d94dfdc46bd27a0360272634b81d402 /packages | |
| parent | 3b0dbf13c1f7e06597ba0c2e18345317b5b7298c (diff) | |
| parent | 266445616acc479196e1be02af1981ef7f3f4569 (diff) | |
merge of '112f00d072dac9a989e6b502c04819e4f2a2be86'
and 'bd74f0d95f3b638b0b4131cb4eb597be6b3b4198'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.21/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko-apps/openmoko-terminal_svn.bb | 2 | ||||
| -rw-r--r-- | packages/pkgconfig/pkgconfig-native_0.22.bb | 4 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 5 |
5 files changed, 10 insertions, 5 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 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 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 + 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 \ " |