From 0654a007425b7b7b4d7646bd5cc2edeb1375d622 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 11 Aug 2005 10:14:41 +0000 Subject: Added unslung-binary-kernel.conf distro for NSLU2 Linksys V2.3R63 firmware with NTFS read/write support. --- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 packages/linux/unslung-kernel_2.4.22.l2.3r63.bb (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb new file mode 100644 index 0000000000..858af69eb0 --- /dev/null +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -0,0 +1,46 @@ +DEFAULT_PREFERENCE_unslung = "-1" + +SECTION = "kernel" +DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" +LICENSE = "GPL" +MAINTAINER = "NSLU2 Linux " +PR = "r0" + +S = "${WORKDIR}/linux-2.4.22" + +KERNEL_IMAGETYPE = "zImage" +KERNEL_SUFFIX = "unslung" + +DEPENDS += "nslu2-linksys-firmware" + +python () { + # Don't build unslung kernel unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + dist = bb.data.getVar("DISTRO", d, 1) + if mach != 'nslu2' or dist != 'unslung': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} + + +do_deploy() { + cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz vmlinuz + dd if=vmlinuz bs=1 count=11732 > vmlinuh + dd if=vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > vmlinux + dd if=vmlinuz bs=1 skip=986841 > vmlinut + cat vmlinux | sed \ + -e 's/ram0/slug/' \ + -e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \ + -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ + -e 's/flash_\x00/hdd_\x00\x00\x00/' \ + -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ + | gzip -9 -c > vmlinux.gz +# cat vmlinuh vmlinux.gz vmlinut > vmlinuz + dd if=/dev/zero of=padding bs=1 count=9 + cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz + install -d ${DEPLOY_DIR}/images + install -m 0644 vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From 1a8447cc2198d81d71b1758a18da50dd6e823f28 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 11 Aug 2005 11:26:15 +0000 Subject: Added the unslung OVERRIDE for unslung-binary-kernel distro --- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 858af69eb0..2a61d61307 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,10 +1,8 @@ -DEFAULT_PREFERENCE_unslung = "-1" - SECTION = "kernel" DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "NSLU2 Linux " -PR = "r0" +PR = "r1" S = "${WORKDIR}/linux-2.4.22" @@ -16,12 +14,10 @@ DEPENDS += "nslu2-linksys-firmware" python () { # Don't build unslung kernel unless we're targeting an nslu2 mach = bb.data.getVar("MACHINE", d, 1) - dist = bb.data.getVar("DISTRO", d, 1) - if mach != 'nslu2' or dist != 'unslung': + if mach != 'nslu2': raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") } - do_deploy() { cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz vmlinuz dd if=vmlinuz bs=1 count=11732 > vmlinuh @@ -30,13 +26,13 @@ do_deploy() { cat vmlinux | sed \ -e 's/ram0/slug/' \ -e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \ - -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ - -e 's/flash_\x00/hdd_\x00\x00\x00/' \ - -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ | gzip -9 -c > vmlinux.gz -# cat vmlinuh vmlinux.gz vmlinut > vmlinuz - dd if=/dev/zero of=padding bs=1 count=9 - cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz +# -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ +# -e 's/flash_\x00/hdd_\x00\x00\x00/' \ +# -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ + cat vmlinuh vmlinux.gz vmlinut > vmlinuz +# dd if=/dev/zero of=padding bs=1 count=9 +# cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz install -d ${DEPLOY_DIR}/images install -m 0644 vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} } -- cgit v1.2.3 From 1acc9a0b4bbdc4eb9f7f2b7e9ab456eab3f9adcb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 13 Aug 2005 23:44:30 +0000 Subject: linux-oz-2.6: Cleanup spitz patches - implement touchscreen nicely, merge code back into corgi_lcd, add backlight. Backlight needs investigation as only partially operational. --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index fd6dd9ee37..bcc2c13c28 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-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 = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,10 +79,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r0.patch;patch=1 \ + ${RPSRC}/spitzbase-r1.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r0.patch;patch=1 \ - ${RPSRC}/spitzlcd-r0.patch;patch=1 \ + ${RPSRC}/spitzssp-r1.patch;patch=1 \ + ${RPSRC}/spitzbl-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -110,7 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \ - ${RPSRC}/spitzts-r0.patch;patch=1 " + ${RPSRC}/spitzts-r1.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" -- cgit v1.2.3 From 3de3e7849c4a001a118f8b8fe3427e734810a3a9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Aug 2005 09:09:00 +0000 Subject: linux-oz-2.6: Update Spitz defconfig --- packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz index 02437440c5..ce1f55b0f9 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-rc5-mm1 -# Fri Aug 12 08:40:57 2005 +# Sat Aug 13 23:17:29 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -160,7 +160,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" # CONFIG_XIP_KERNEL is not set # @@ -714,7 +714,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y -# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_CORGI=y # # Speakup console speech -- cgit v1.2.3 From f3eb2fd587d41e922fa051c983eff8c3f75814bb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Aug 2005 21:28:10 +0000 Subject: linux-oz-2.6: Add wireless extentions to spitz-defconfig. Update spitzssp to fix backlight problems and remove bit banging code (yay\!). --- .../defconfig-spitz | 40 ++++++++++++++++++++-- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 10 +++--- 2 files changed, 42 insertions(+), 8 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz index ce1f55b0f9..a388797b6e 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-rc5-mm1 -# Sat Aug 13 23:17:29 2005 +# Sun Aug 14 22:04:01 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -519,12 +519,46 @@ CONFIG_NETDEVICES=y # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y # # PCMCIA network device support # -# CONFIG_NET_PCMCIA is not set +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +# CONFIG_PCMCIA_PCNET is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set # # Wan interfaces diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index bcc2c13c28..48728ec52b 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-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 = "r4" +PR = "r5" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -81,8 +81,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ ${RPSRC}/spitzbase-r1.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r1.patch;patch=1 \ - ${RPSRC}/spitzbl-r0.patch;patch=1 \ + ${RPSRC}/spitzssp-r2.patch;patch=1 \ + ${RPSRC}/spitzbl-r1.patch;patch=1 \ + ${RPSRC}/spitzts-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -109,8 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/wm9712-ts-r2.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " -SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \ - ${RPSRC}/spitzts-r1.patch;patch=1 " +SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" -- cgit v1.2.3 From ee1f96a1105d5582d79dc1198bcb0f9ca0dcb11a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Aug 2005 22:49:10 +0000 Subject: linux-oz-2.6: Merge spitz ssp driver into corgi --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 48728ec52b..7dcd3ee7ee 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-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" @@ -79,9 +79,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r1.patch;patch=1 \ + ${RPSRC}/spitzbase-r2.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r2.patch;patch=1 \ + ${RPSRC}/spitzssp-r4.patch;patch=1 \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ -- cgit v1.2.3 From ae456f8e9a619d61f4eb4fbd8c0f4dacb15d0a0c Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 15 Aug 2005 10:46:36 +0000 Subject: add conntrack and queue modules for iptables --- packages/linux/unslung-kernel/defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 7e380b08cf..24899fbd47 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -388,8 +388,8 @@ CONFIG_IP_PNP_BOOTP=y # # IP: Netfilter Configuration # -# CONFIG_IP_NF_CONNTRACK is not set -# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m CONFIG_IP_NF_MATCH_MAC=m -- cgit v1.2.3 From 5717cd51ea4f5a0a695fa85803bc58fa5b18efb2 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 15 Aug 2005 10:49:18 +0000 Subject: Oops forgot to bump the version --- packages/linux/unslung-kernel_2.4.22.l2.3r29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index 604dbd21ba..ac068a7f27 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r2" +PR = "r3" KERNEL_SUFFIX = "unslung" -- cgit v1.2.3 From 28a1024eb3891c70f459332fc9aef59d55aeb063 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 11:56:45 +0000 Subject: Add IPTABLES config and CONFIG_BRIDGE --- packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +- packages/linux/openslug-kernel-2.6.12.2/defconfig | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index a536e866e6..ae20210282 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r9" +PR = "r10" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 2e60b1f22a..9c4a61abda 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -434,16 +434,18 @@ CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m # # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set CONFIG_LLC=m -- cgit v1.2.3 From 9dc45ad0f61abfd589855757860a815deccaaeed Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 13 Aug 2005 17:12:43 +0000 Subject: Fixed the unslung binary kernel to build from source as well as using the binary (so that our additional kernel modules make it into the rootfs). --- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 55 +++++++++++++++---------- 1 file changed, 34 insertions(+), 21 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 2a61d61307..0a7a8f3dd2 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,15 +1,30 @@ SECTION = "kernel" + +include nslu2-linksys-kernel_2.4.22.bb + DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" -LICENSE = "GPL" MAINTAINER = "NSLU2 Linux " -PR = "r1" - -S = "${WORKDIR}/linux-2.4.22" +PR = "r2" -KERNEL_IMAGETYPE = "zImage" KERNEL_SUFFIX = "unslung" -DEPENDS += "nslu2-linksys-firmware" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" + +UNSLUNG_KERNEL_EXTRA_SRC_URI ?= + +SRC_URI += "file://limit1gb.patch;patch=1 \ + file://gl811e.patch;patch=1 \ + file://ext3flash-on-disk1.patch;patch=1 \ + file://usbnet.patch;patch=1 \ + file://missing-usb-ioctls.patch;patch=1 \ + file://anonymiser.patch;patch=1 \ + file://ppp_mppe.patch;patch=1 \ + file://nfs-blocksize.patch;patch=1 \ + file://pl2303.patch;patch=1 \ + file://linux-kernel-R25_to_R29.patch;patch=1 \ + ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" python () { # Don't build unslung kernel unless we're targeting an nslu2 @@ -18,25 +33,23 @@ python () { raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") } -do_deploy() { - cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz vmlinuz - dd if=vmlinuz bs=1 count=11732 > vmlinuh - dd if=vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > vmlinux - dd if=vmlinuz bs=1 skip=986841 > vmlinut - cat vmlinux | sed \ +DEPENDS += "nslu2-linksys-firmware" + +do_deploy_append() { + cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz ${WORKDIR}/vmlinuz + dd if=${WORKDIR}/vmlinuz bs=1 count=11732 > ${WORKDIR}/vmlinuh + dd if=${WORKDIR}/vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > ${WORKDIR}/vmlinux + dd if=${WORKDIR}/vmlinuz bs=1 skip=986841 > ${WORKDIR}/vmlinut + cat ${WORKDIR}/vmlinux | sed \ -e 's/ram0/slug/' \ -e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \ - | gzip -9 -c > vmlinux.gz + | gzip -9 -c > ${WORKDIR}/vmlinux.gz # -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ # -e 's/flash_\x00/hdd_\x00\x00\x00/' \ # -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ - cat vmlinuh vmlinux.gz vmlinut > vmlinuz -# dd if=/dev/zero of=padding bs=1 count=9 -# cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz + cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz +# dd if=/dev/zero of=${WORKDIR}/padding bs=1 count=9 +# cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/padding ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz install -d ${DEPLOY_DIR}/images - install -m 0644 vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} + install -m 0644 ${WORKDIR}/vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} } - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile -- cgit v1.2.3 From 5ad7c1179d60da9d92c9deb3488ba4833d9b3a83 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 16:36:20 +0000 Subject: Add a bunch of iptables/bridging-related modules --- packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +- packages/linux/openslug-kernel-2.6.12.2/defconfig | 85 ++++++++++++++++++++++- 2 files changed, 84 insertions(+), 3 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index ae20210282..f15fc998a3 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r10" +PR = "r11" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 9c4a61abda..15f2fecdb1 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -401,11 +401,13 @@ CONFIG_SCSI_QLA2XXX=y # # CONFIG_I2O is not set + # # Networking support # CONFIG_NET=y + # # Networking options # @@ -427,6 +429,11 @@ CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m CONFIG_IP_TCPDIAG_IPV6=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set CONFIG_INET6_AH=m @@ -435,10 +442,83 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +CONFIG_IP_NF_MATCH_HELPER=m +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_REALM=m +# CONFIG_IP_NF_MATCH_SCTP is not set +CONFIG_IP_NF_MATCH_COMMENT=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_CLASSIFY=m +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set # # SCTP Configuration (EXPERIMENTAL) @@ -489,6 +569,7 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_BT_HIDP is not set + # # Bluetooth device drivers # -- cgit v1.2.3 From 454801b08ddfec306bbe7a4895704581ba7c55ea Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 15 Aug 2005 23:18:25 +0000 Subject: Added the missing NetFilter options --- packages/linux/unslung-kernel/defconfig | 11 +++++++++++ packages/linux/unslung-kernel_2.4.22.l2.3r29.bb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'packages/linux') diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 24899fbd47..01d6ab7e4e 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -389,6 +389,17 @@ CONFIG_IP_PNP_BOOTP=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_FTP is not set +# CONFIG_IP_NF_H323 is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_IRC is not set +# CONFIG_IP_NF_CT_PROTO_GRE is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_MATCH_HELPER is not set +# CONFIG_IP_NF_MATCH_STATE is not set +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_NAT is not set CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index ac068a7f27..c02b45505e 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r3" +PR = "r4" KERNEL_SUFFIX = "unslung" -- cgit v1.2.3 From a0614e469bea3e87c609d4f35a1a402cc7f0b252 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Aug 2005 23:19:55 +0000 Subject: linux-oz-2.6: Update the pcmcia to scoop interface fixing a card detect irq problem for both spitz and c7x0 --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 7dcd3ee7ee..fe8280a784 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-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 = "r6" +PR = "r7" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -43,9 +43,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \ ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \ ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ + ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ @@ -78,12 +79,13 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r2.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r1.patch;patch=1 \ + ${RPSRC}/spitzbase-r3.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ ${RPSRC}/spitzssp-r4.patch;patch=1 \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ + ${RPSRC}/spitzcf-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -110,7 +112,6 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/wm9712-ts-r2.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " -SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" -- cgit v1.2.3 From f14b18957b0d5fe335611f2d53b387f52eba8b81 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 16 Aug 2005 16:11:26 +0000 Subject: Alter the pcmcia socket init order on spitz to try and guarantee microdrive=/dev/hda. Add some device ids and alter some init levels so root=/dev/hda1 will boot directly to the microdrive (no pivot boot). --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index fe8280a784..e624b8a1d5 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-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 = "r7" +PR = "r8" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -86,6 +86,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ + ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ + ${RPSRC}/pxa_cf_initorder_hack-r0.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ -- cgit v1.2.3