diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-21 14:21:28 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-21 14:21:28 +0000 |
commit | c0a250728e6985d545e336fe82df3918e6c5a442 (patch) | |
tree | c8f435ec69fd68750ff530deaabad2c9df989250 /packages/linux | |
parent | 06a7a3e0cdf0c08f25cb3dc4ce5ae57f416c31a7 (diff) | |
parent | e445bbb501bc1eb0725dfb65d73c4438f1991f2e (diff) |
merge of f5dd78fd37750576d502b8124f093d45ca992ca6
and f9869d372bd0705706ba5562f7a5b7bb25208ff3
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 | 6 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-mm1.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-wrt_2.4.30.bb | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 index b6b7cbc17d..8e4712da4f 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 @@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=y +CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=y +CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fe94202c9d..b8f64bed78 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r6" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index e17bfdfe6a..444fb5b7ea 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -1,15 +1,14 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" HOMEPAGE = "http://openwrt.org" +DEPENDS = "lzma-native" LICENSE = "GPL" PR = "r2" -DEPENDS = "lzma-native" - SRC_URI = "http://www.fi.kernel.org/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \ - http://downloads.openwrt.org/kernel-binary-wl-0.2.tar.gz \ - http://downloads.openwrt.org/kernel-source-et-0.6.tar.gz \ + http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz \ + http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz \ file://000-linux-mips-2_4_30.patch;patch=1 \ file://001-Makefile;patch=1 \ file://002-Rules_make;patch=1 \ |