From: Chris Larson Date: Thu, 23 Sep 2004 16:43:30 +0000 (+0000) Subject: Merge X-Git-Tag: 2.6.0~7030 X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=6454a46033107d7f70f13961615cb947297602e3;p=vuplus_openembedded Merge 2004/09/21 08:23:12+09:30 (none)!rwhitby Renamed linux-nslu2 to nslu2-linksys as per discussion with kergoth, and modified nslu2.conf, unslung.conf and openslug.conf to match. BKrev: 4152fd320fGVJ_PPonCqGohq9t3Kmg --- diff --git a/conf/anyu2.conf b/conf/anyu2.conf deleted file mode 100644 index 567e104..0000000 --- a/conf/anyu2.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Distribution -#@NAME: AnyU2 -#@DESCRIPTION: AnyU2 Linux Distribution configuration - -INHERIT += " package_ipk debian nslu2_flashimg" - -IMAGE_FSTYPE = "ext2.gz" diff --git a/conf/nslu2.conf b/conf/nslu2.conf index 191224e..8d5ab8a 100644 --- a/conf/nslu2.conf +++ b/conf/nslu2.conf @@ -5,8 +5,6 @@ TARGET_ARCH = "armeb" IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-nslu2" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" IMAGE_ROOTFS_SIZE_ext2 = "8192" IMAGE_ROOTFS_SIZE_ext2.gz = "8192" diff --git a/conf/openslug.conf b/conf/openslug.conf new file mode 100644 index 0000000..e69de29 diff --git a/conf/unslung.conf b/conf/unslung.conf index 331ce2d..b080b17 100644 --- a/conf/unslung.conf +++ b/conf/unslung.conf @@ -1,9 +1,13 @@ #@TYPE: Distribution -#@NAME: Unslung Linux -#@DESCRIPTION: Distribution for packages to be run on the Linksys firmware in the NSLU2 +#@NAME: Unslung +#@DESCRIPTION: Unslung Linux Distribution for the NSLU2 INHERIT += " package_ipk debian nslu2_flashimg" + IMAGE_FSTYPE = "ext2.gz" +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-linksys" + PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" diff --git a/linux/linux-nslu2-2.4.22/gcc-registerparanoia.patch b/linux/linux-nslu2-2.4.22/gcc-registerparanoia.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/gcc3-userfuncs.patch b/linux/linux-nslu2-2.4.22/gcc3-userfuncs.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/linksys_can_bite_me.patch b/linux/linux-nslu2-2.4.22/linksys_can_bite_me.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/linux-2.4.24-attribute-used.patch b/linux/linux-nslu2-2.4.22/linux-2.4.24-attribute-used.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/nofpu.patch b/linux/linux-nslu2-2.4.22/nofpu.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/nslu2/defconfig b/linux/linux-nslu2-2.4.22/nslu2/defconfig deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2-2.4.22/short_loadbytes.patch b/linux/linux-nslu2-2.4.22/short_loadbytes.patch deleted file mode 100644 index e69de29..0000000 diff --git a/linux/linux-nslu2_2.4.22.oe b/linux/linux-nslu2_2.4.22.oe deleted file mode 100644 index f3fb496..0000000 --- a/linux/linux-nslu2_2.4.22.oe +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" -LICENSE = "GPL" -MAINTAINER = "Chris Larson " -PR = "r1" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ - ftp://oss.sgi.com/projects/xfs/patches/2.4.22/xfs-2.4.22-all-i386.bz2;patch=1 \ - http://openembedded.org/dl/2.4.22-xfs-nslu2.patch.bz2;patch=1 \ - file://linksys_can_bite_me.patch;patch=1 \ - file://nofpu.patch;patch=1 \ - file://short_loadbytes.patch;patch=1 \ - file://gcc3-userfuncs.patch;patch=1 \ - file://gcc-registerparanoia.patch;patch=1 \ - file://linux-2.4.24-attribute-used.patch;patch=1 \ - file://defconfig" -S = "${WORKDIR}/linux-2.4.22" - -COMPATIBLE_HOST = 'arm.*-linux' - -inherit kernel - -ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" -CMDLINE_CONSOLE ?= "ttyS0,115200" -CMDLINE_ROOT = "root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000" -CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ - ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch -} - -do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}.bin-${DATETIME} -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile - diff --git a/linux/nslu2-linksys-2.4.22/gcc-registerparanoia.patch b/linux/nslu2-linksys-2.4.22/gcc-registerparanoia.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/gcc3-userfuncs.patch b/linux/nslu2-linksys-2.4.22/gcc3-userfuncs.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/linksys_can_bite_me.patch b/linux/nslu2-linksys-2.4.22/linksys_can_bite_me.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/linux-2.4.24-attribute-used.patch b/linux/nslu2-linksys-2.4.22/linux-2.4.24-attribute-used.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/nofpu.patch b/linux/nslu2-linksys-2.4.22/nofpu.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/nslu2/defconfig b/linux/nslu2-linksys-2.4.22/nslu2/defconfig new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys-2.4.22/short_loadbytes.patch b/linux/nslu2-linksys-2.4.22/short_loadbytes.patch new file mode 100644 index 0000000..e69de29 diff --git a/linux/nslu2-linksys_2.4.22.oe b/linux/nslu2-linksys_2.4.22.oe new file mode 100644 index 0000000..e69de29