diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-14 18:00:44 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-14 18:00:44 +0000 |
commit | 116dddad4ec038b7d4322f8201556e6cf420fb96 (patch) | |
tree | 6b63fde6284678a936958ac42f0743a8e1869e70 /conf/distro | |
parent | aa37baae309e595282a53af6cdfe7a5a77eb530a (diff) | |
parent | 856f8e9dbe8ab445ecde0e10c86bcc9b0bda00f8 (diff) |
merge of a43a3081d043237ce284af591c69b35171e746be
and b91f743ce475bca1b138c7fd63260e83a34f53c2
Diffstat (limited to 'conf/distro')
-rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
-rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
-rw-r--r-- | conf/distro/ucslugc.conf | 2 | ||||
-rw-r--r-- | conf/distro/unslung-binary-kernel-packages.conf | 38 | ||||
-rw-r--r-- | conf/distro/unslung-binary-kernel.conf | 56 | ||||
-rw-r--r-- | conf/distro/unslung-packages.conf | 1 | ||||
-rw-r--r-- | conf/distro/unslung.conf | 10 |
7 files changed, 107 insertions, 4 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 347071e2b8..79c680a12d 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -169,6 +169,7 @@ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/upslug/*.bb \ +${PKGDIR}/packages/usbutils/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wakelan/*.bb \ @@ -176,4 +177,5 @@ ${PKGDIR}/packages/watchdog/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ +${PKGDIR}/packages/zd1211/*.bb \ ${OPENSLUG_EXTRA_BBFILES}" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 78e3cc0378..b5a580d97b 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -15,7 +15,7 @@ TARGET_OS = "linux" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see openslug-packages.conf in this diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 0376eadd00..39251c5375 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -19,7 +19,7 @@ ARM_INTERWORK = ":thumb-interwork" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # The OVERRIDES are modified here so that 'openslug' overrides are picked up if # present (ucslugc overrides take precedence). diff --git a/conf/distro/unslung-binary-kernel-packages.conf b/conf/distro/unslung-binary-kernel-packages.conf new file mode 100644 index 0000000000..3e9059fae8 --- /dev/null +++ b/conf/distro/unslung-binary-kernel-packages.conf @@ -0,0 +1,38 @@ +# automatically generated by bitbake freeze +BBFILES := "\ +${PKGDIR}/packages/autoconf/*.bb \ +${PKGDIR}/packages/automake/*.bb \ +${PKGDIR}/packages/binutils/*.bb \ +${PKGDIR}/packages/bison/*.bb \ +${PKGDIR}/packages/busybox/*.bb \ +${PKGDIR}/packages/cpio/*.bb \ +${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/fakeroot/*.bb \ +${PKGDIR}/packages/findutils/*.bb \ +${PKGDIR}/packages/flex/*.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/gcc/*.bb \ +${PKGDIR}/packages/genext2fs/*.bb \ +${PKGDIR}/packages/gettext/*.bb \ +${PKGDIR}/packages/glibc/*.bb \ +${PKGDIR}/packages/gnu-config/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/ipkg/*.bb \ +${PKGDIR}/packages/libtool/*.bb \ +${PKGDIR}/packages/linux-libc-headers/*.bb \ +${PKGDIR}/packages/linux/*.bb \ +${PKGDIR}/packages/m4/*.bb \ +${PKGDIR}/packages/makedevs/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${PKGDIR}/packages/modutils/*.bb \ +${PKGDIR}/packages/mtd/*.bb \ +${PKGDIR}/packages/nslu2-binary-only/*.bb \ +${PKGDIR}/packages/pkgconfig/*.bb \ +${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/unzip/*.bb \ +${PKGDIR}/packages/update-modules/*.bb \ +${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/zlib/*.bb \ +${UNSLUNG_EXTRA_BBFILES}" diff --git a/conf/distro/unslung-binary-kernel.conf b/conf/distro/unslung-binary-kernel.conf new file mode 100644 index 0000000000..20a1e32fa7 --- /dev/null +++ b/conf/distro/unslung-binary-kernel.conf @@ -0,0 +1,56 @@ +#@TYPE: Distribution +#@NAME: Unslung +#@DESCRIPTION: Unslung Linux Distribution for the NSLU2 + +FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross" +FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" +FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" + +DISTRO_NAME = "Unslung" +DISTRO_VERSION = "6.0-beta" +DISTRO_TYPE = "beta" + +# pull in the frozen list of bbfiles +UNSLUNG_EXTRA_BBFILES ?= "" +include conf/distro/freeze.conf + +TARGET_FPU = "soft" +TARGET_OS = "linux" + +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +INHERIT += " package_ipk nslu2-ramdisk-image" + +# The OVERRIDES are modified here so that 'unslung' overrides are picked up if +# present (unslung-binary-kernel overrides take precedence). +NSLU2_BASE_DISTRO = ":unslung" + +IMAGE_FSTYPE = "ext2.gz" +UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" +EXTRA_IMAGECMD_ext2.gz = "-D ${UNSLUNG_DEVICE_TABLE}" +IMAGE_ROOTFS_SIZE_ext2.gz = "14000" + +UNSLUNG_EXTRA_DEPENDS ?= "" +UNSLUNG_EXTRA_RDEPENDS ?= "\ +kernel-module-usbnet \ +kernel-module-pegasus kernel-module-kaweth \ +kernel-module-usbserial \ +kernel-module-pl2303 kernel-module-ftdi-sio" + +UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_VERSION_glibc ?= "2.2.5" +PREFERRED_VERSION_glibc-initial ?= "2.2.5" +PREFERRED_VERSION_binutils ?= "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" + +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf index 1f41b1e846..3e9059fae8 100644 --- a/conf/distro/unslung-packages.conf +++ b/conf/distro/unslung-packages.conf @@ -12,6 +12,7 @@ ${PKGDIR}/packages/findutils/*.bb \ ${PKGDIR}/packages/flex/*.bb \ ${PKGDIR}/packages/freeze/*.bb \ ${PKGDIR}/packages/gcc/*.bb \ +${PKGDIR}/packages/genext2fs/*.bb \ ${PKGDIR}/packages/gettext/*.bb \ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 75c251f220..06331707fc 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" DISTRO_NAME = "Unslung" -DISTRO_VERSION = "5.5-beta" +DISTRO_VERSION = "5.6-alpha" DISTRO_TYPE = "beta" # pull in the frozen list of bbfiles @@ -19,7 +19,7 @@ TARGET_OS = "linux" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -INHERIT += " package_ipk nslu2_flashimg" +INHERIT += " package_ipk nslu2-jffs2-image" IMAGE_FSTYPE = "jffs2" UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" @@ -43,3 +43,9 @@ PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" + +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r29" |