diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-05 06:16:22 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-05 06:16:22 +0000 |
| commit | c6ef2a3e30af363c4b9ca1e9bae81b1f2df16ce9 (patch) | |
| tree | 3772ad771b11f7a2971b49721f5dd6617493c787 | |
| parent | 2e73052fdbcb7b374e823cda25503a7a10dbc69d (diff) | |
| parent | aea7a790f3a96a488c6197cacb26707fbbda16a4 (diff) | |
merge of 755dbf7499934a2404de279fb00043830c15add1
and c110ccecd8770f6c3ae49eead02de2c93ffac02b
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.15/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.15.2.bb | 4 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 | ||||
| -rw-r--r-- | packages/wget/wget_1.9.1.bb | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index 7d92739afd..8279471c78 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1399,7 +1399,7 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set +CONFIG_USB_LD=m # CONFIG_USB_TEST is not set # diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.2.bb index 90bc6554f0..10163296b6 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.2.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "0" +PR_CONFIG = "1" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r1.${PR_CONFIG}" +PR = "r2.${PR_CONFIG}" include ixp4xx-kernel.inc diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 561f593560..7c4c21f521 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r53" +PR = "r54" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb index eb5e509085..ec1f00d4ad 100644 --- a/packages/wget/wget_1.9.1.bb +++ b/packages/wget/wget_1.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." SECTION = "console/network" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" DEPENDS = "" -PR = "r3" +PR = "r4" LICENSE = "GPL" SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ @@ -16,6 +16,8 @@ EXTRA_OECONF = "--enable-ipv6" # The unslung kernel does not support ipv6 EXTRA_OECONF_unslung = "" +# SlugOS kernels do not support ipv6. Can be loaded as a module. +EXTRA_OECONF_slugos = "" do_configure () { if [ ! -e acinclude.m4 ]; then |