From 8e9b42bba2459171ab1e96691a446ae2cc86e0fa Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 16 Jan 2008 00:15:44 +0000 Subject: linux-ixp4xx: Updated to 2.6.23.14 --- conf/distro/include/sane-srcrevs.inc | 2 +- conf/machine/include/ixp4xx.inc | 2 +- packages/linux/linux-ixp4xx_2.6.23.12.bb | 45 -------------------------------- packages/linux/linux-ixp4xx_2.6.23.14.bb | 41 +++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 47 deletions(-) delete mode 100644 packages/linux/linux-ixp4xx_2.6.23.12.bb create mode 100644 packages/linux/linux-ixp4xx_2.6.23.14.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b612b2ffdf..29c04437dd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,7 +43,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "957" +SRCREV_pn-linux-ixp4xx ?= "983" SRCREV_pn-linux-openmoko ?= "3801" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index bdf00d15c9..924fb54f1e 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" diff --git a/packages/linux/linux-ixp4xx_2.6.23.12.bb b/packages/linux/linux-ixp4xx_2.6.23.12.bb deleted file mode 100644 index 14b79ae7cb..0000000000 --- a/packages/linux/linux-ixp4xx_2.6.23.12.bb +++ /dev/null @@ -1,45 +0,0 @@ -# The new ethernet driver included in the 2.6.23 version of the nslu2-linux.org kernel patches -# has problems with providing the correct MAC address on the initial DHCP request. -DEFAULT_PREFERENCE = "-1" - -require linux.inc -require linux-ixp4xx.inc - -VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.23.12" - -# If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" - -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ - svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \ - file://defconfig-${KERNEL_RELEASE}" - -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -# Apply the patches from the nslu2-linux project (after the patches in SRC_URI) -do_postpatch() { - # Move away OE patches which have been already applied. - mv ${S}/patches ${S}/patches.oe - mv .pc .pc.oe - - # Move the NSLU2 patches in place for quilt and apply them. - mv ${WORKDIR}/${VANILLA_VERSION} ${S}/patches && cd ${S} && quilt push -av - - # Store the NSLU2 patches - mv ${S}/patches ${S}/patches.ixp4xx - mv .pc .pc.ixp4xx - - # And move back the OE patches - mv ${S}/patches.oe ${S}/patches - mv .pc.oe .pc - - # Copy the defconfig into ${WORKDIR} - mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig -} - -addtask postpatch after do_patch before do_configure diff --git a/packages/linux/linux-ixp4xx_2.6.23.14.bb b/packages/linux/linux-ixp4xx_2.6.23.14.bb new file mode 100644 index 0000000000..b7c7682370 --- /dev/null +++ b/packages/linux/linux-ixp4xx_2.6.23.14.bb @@ -0,0 +1,41 @@ +require linux.inc +require linux-ixp4xx.inc + +VANILLA_VERSION = "2.6.23" +KERNEL_RELEASE = "2.6.23.14" + +# If you use a rc, you will need to use this: +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" + +PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \ + file://defconfig-${KERNEL_RELEASE}" + +S = "${WORKDIR}/linux-${VANILLA_VERSION}" + +# Apply the patches from the nslu2-linux project (after the patches in SRC_URI) +do_postpatch() { + # Move away OE patches which have been already applied. + mv ${S}/patches ${S}/patches.oe + mv .pc .pc.oe + + # Move the NSLU2 patches in place for quilt and apply them. + mv ${WORKDIR}/${VANILLA_VERSION} ${S}/patches && cd ${S} && quilt push -av + + # Store the NSLU2 patches + mv ${S}/patches ${S}/patches.ixp4xx + mv .pc .pc.ixp4xx + + # And move back the OE patches + mv ${S}/patches.oe ${S}/patches + mv .pc.oe .pc + + # Copy the defconfig into ${WORKDIR} + mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig +} + +addtask postpatch after do_patch before do_configure -- cgit v1.2.3