diff options
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/debianslug-packages.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/freeze.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/openslug-native-packages.inc | 11 | ||||
| -rw-r--r-- | conf/distro/include/openslug-packages.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos-packages.inc | 259 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 92 | ||||
| -rw-r--r-- | conf/distro/include/ucslugc-packages.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/unslung-packages.inc | 41 |
9 files changed, 24 insertions, 397 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 79ec27af72..9efe1d5d90 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -37,10 +37,6 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" - -#Make a LE jffs2 image -SLUGOS_IMAGESEX = "little-endian" - #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" @@ -50,4 +46,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" -DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" +DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc deleted file mode 100644 index a4b9a6720f..0000000000 --- a/conf/distro/include/debianslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc index d41cb89111..4c2c8b1e2e 100644 --- a/conf/distro/include/freeze.inc +++ b/conf/distro/include/freeze.inc @@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security" # Pull in the frozen definitions (if they exist) The multiple # includes allow the frozen file to be stored alongside local.conf -# and in the conf/distro directory - the former take precedence over -# the latter. -require conf/distro/include/${DISTRO}-packages.inc +# and in a distro-specific frozen directory - the former take +# precedence over the latter. include conf/${DISTRO}-packages.conf include ${FROZEN_DIR}/${DISTRO}-packages.conf -require conf/distro/include/${DISTRO}-bbfiles.inc include conf/${DISTRO}-bbfiles.conf include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf diff --git a/conf/distro/include/openslug-native-packages.inc b/conf/distro/include/openslug-native-packages.inc deleted file mode 100644 index 7f7a448434..0000000000 --- a/conf/distro/include/openslug-native-packages.inc +++ /dev/null @@ -1,11 +0,0 @@ -# automatically generated by bitbake freeze -BBFILES := "\ -${PKGDIR}/packages/apache/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/meta/package-index.bb \ -${PKGDIR}/packages/meta/openslug-native-packages.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${OPENSLUG_NATIVE_EXTRA_BBFILES}" diff --git a/conf/distro/include/openslug-packages.inc b/conf/distro/include/openslug-packages.inc deleted file mode 100644 index fe09a7bcfa..0000000000 --- a/conf/distro/include/openslug-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/slugos-packages.inc b/conf/distro/include/slugos-packages.inc deleted file mode 100644 index 650368a990..0000000000 --- a/conf/distro/include/slugos-packages.inc +++ /dev/null @@ -1,259 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/alsa/*.bb \ -${PKGDIR}/packages/apr/*.bb \ -${PKGDIR}/packages/asterisk/*.bb \ -${PKGDIR}/packages/asterisk-sounds/*.bb \ -${PKGDIR}/packages/atftp/*.bb \ -${PKGDIR}/packages/audiofile/*.bb \ -${PKGDIR}/packages/aumix/*.bb \ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/base-files/*.bb \ -${PKGDIR}/packages/base-passwd/*.bb \ -${PKGDIR}/packages/bash/*.bb \ -${PKGDIR}/packages/beep/*.bb \ -${PKGDIR}/packages/bind/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez/*.bb \ -${PKGDIR}/packages/bogofilter/*.bb \ -${PKGDIR}/packages/boost/*.bb \ -${PKGDIR}/packages/bridge-utils/*.bb \ -${PKGDIR}/packages/btsco/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/bwmon/*.bb \ -${PKGDIR}/packages/bzip2/*.bb \ -${PKGDIR}/packages/ccxstream/*.bb \ -${PKGDIR}/packages/cdparanoia/*.bb \ -${PKGDIR}/packages/cdstatus/*.bb \ -${PKGDIR}/packages/cherokee/*.bb \ -${PKGDIR}/packages/coreutils/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/cron/*.bb \ -${PKGDIR}/packages/ctorrent/*.bb \ -${PKGDIR}/packages/ctrlproxy/*.bb \ -${PKGDIR}/packages/curl/*.bb \ -${PKGDIR}/packages/cvs/*.bb \ -${PKGDIR}/packages/cyrus-imapd/*.bb \ -${PKGDIR}/packages/cyrus-sasl/*.bb \ -${PKGDIR}/packages/davfs2/*.bb \ -${PKGDIR}/packages/db/*.bb \ -${PKGDIR}/packages/dbus/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/device-mapper/*.bb \ -${PKGDIR}/packages/devlabel/*.bb \ -${PKGDIR}/packages/dhcp/*.bb \ -${PKGDIR}/packages/didiwiki/*.bb \ -${PKGDIR}/packages/diffstat/*.bb \ -${PKGDIR}/packages/diffutils/*.bb \ -${PKGDIR}/packages/dnsmasq/*.bb \ -${PKGDIR}/packages/docbook-utils/*.bb \ -${PKGDIR}/packages/dropbear/*.bb \ -${PKGDIR}/packages/dsniff/*.bb \ -${PKGDIR}/packages/e2fsprogs/*.bb \ -${PKGDIR}/packages/e2fsprogs-libs/*.bb \ -${PKGDIR}/packages/eciadsl/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${PKGDIR}/packages/ez-ipupdate/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/fetchmail/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flac/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/ftpd-topfield/*.bb \ -${PKGDIR}/packages/gawk/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/gd/*.bb \ -${PKGDIR}/packages/gdb/*.bb \ -${PKGDIR}/packages/gdbm/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glib-1.2/*.bb \ -${PKGDIR}/packages/glib-2.0/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/gnutls/*.bb \ -${PKGDIR}/packages/gphoto2/*.bb \ -${PKGDIR}/packages/gpsd/*.bb \ -${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ -${PKGDIR}/packages/gtk-doc/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${PKGDIR}/packages/hal/*.bb \ -${PKGDIR}/packages/hotplug-ng/*.bb \ -${PKGDIR}/packages/icecast/*.bb \ -${PKGDIR}/packages/ifupdown/*.bb \ -${PKGDIR}/packages/initscripts/*.bb \ -${PKGDIR}/packages/install/*.bb \ -${PKGDIR}/packages/intltool/*.bb \ -${PKGDIR}/packages/iperf/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/iptables/*.bb \ -${PKGDIR}/packages/ircp/*.bb \ -${PKGDIR}/packages/irssi/*.bb \ -${PKGDIR}/packages/ixp425-eth/*.bb \ -${PKGDIR}/packages/ixp4xx/*.bb \ -${PKGDIR}/packages/joe/*.bb \ -${PKGDIR}/packages/jpeg/*.bb \ -${PKGDIR}/packages/lcdproc/*.bb \ -${PKGDIR}/packages/less/*.bb \ -${PKGDIR}/packages/libaal/*.bb \ -${PKGDIR}/packages/libao/*.bb \ -${PKGDIR}/packages/libdvb/*.bb \ -${PKGDIR}/packages/libexif/*.bb \ -${PKGDIR}/packages/libgcrypt/*.bb \ -${PKGDIR}/packages/libgpg-error/*.bb \ -${PKGDIR}/packages/libgphoto2/*.bb \ -${PKGDIR}/packages/libgsm/*.bb \ -${PKGDIR}/packages/libiconv/*.bb \ -${PKGDIR}/packages/libid3tag/*.bb \ -${PKGDIR}/packages/liblockfile/*.bb \ -${PKGDIR}/packages/libmad/*.bb \ -${PKGDIR}/packages/libmikmod/*.bb \ -${PKGDIR}/packages/libnet/*.bb \ -${PKGDIR}/packages/libnids/*.bb \ -${PKGDIR}/packages/libogg/*.bb \ -${PKGDIR}/packages/libol/*.bb \ -${PKGDIR}/packages/libpcap/*.bb \ -${PKGDIR}/packages/libpng/*.bb \ -${PKGDIR}/packages/libtiff/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/libusb/*.bb \ -${PKGDIR}/packages/libvorbis/*.bb \ -${PKGDIR}/packages/libxml/*.bb \ -${PKGDIR}/packages/libxslt/* \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/lirc/*.bb \ -${PKGDIR}/packages/lrzsz/*.bb \ -${PKGDIR}/packages/lsof/*.bb \ -${PKGDIR}/packages/lvm2/*.bb \ -${PKGDIR}/packages/lzo/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/madplay/*.bb \ -${PKGDIR}/packages/madwifi/*.bb \ -${PKGDIR}/packages/mailx/*.bb \ -${PKGDIR}/packages/make/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ -${PKGDIR}/packages/masqmail/*.bb \ -${PKGDIR}/packages/mdadm/*.bb \ -${PKGDIR}/packages/memtester/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/mgetty/*.bb \ -${PKGDIR}/packages/miau/*.bb \ -${PKGDIR}/packages/microcom/*.bb \ -${PKGDIR}/packages/minicom/*.bb \ -${PKGDIR}/packages/module-init-tools/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/monotone/*.bb \ -${PKGDIR}/packages/motion/*.bb \ -${PKGDIR}/packages/mt-daapd/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/musicpd/*.bb \ -${PKGDIR}/packages/mutt/*.bb \ -${PKGDIR}/packages/mysql/*.bb \ -${PKGDIR}/packages/nail/*.bb \ -${PKGDIR}/packages/nano/*.bb \ -${PKGDIR}/packages/ncftp/*.bb \ -${PKGDIR}/packages/ncurses/*.bb \ -${PKGDIR}/packages/neon/*.bb \ -${PKGDIR}/packages/netbase/*.bb \ -${PKGDIR}/packages/netcat/*.bb \ -${PKGDIR}/packages/netpbm/*.bb \ -${PKGDIR}/packages/nfs-utils/*.bb \ -${PKGDIR}/packages/nis/*.bb \ -${PKGDIR}/packages/nmap/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/ntp/*.bb \ -${PKGDIR}/packages/obexftp/*.bb \ -${PKGDIR}/packages/openjade/*.bb \ -${PKGDIR}/packages/openldap/*.bb \ -${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex/*.bb \ -${PKGDIR}/packages/opensp/*.bb \ -${PKGDIR}/packages/openssh/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/openvpn/*.bb \ -${PKGDIR}/packages/pam/*.bb \ -${PKGDIR}/packages/patch/*.bb \ -${PKGDIR}/packages/patcher/*.bb \ -${PKGDIR}/packages/patchutils/*.bb \ -${PKGDIR}/packages/pciutils/*.bb \ -${PKGDIR}/packages/pcmcia-cs/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/perl/*.bb \ -${PKGDIR}/packages/php/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/popt/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/postfix/*.bb \ -${PKGDIR}/packages/ppp/*.bb \ -${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ -${PKGDIR}/packages/puppy/*.bb \ -${PKGDIR}/packages/pvrusb2-mci/*.bb \ -${PKGDIR}/packages/pwc/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/qc-usb/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/radlib/*.bb \ -${PKGDIR}/packages/readline/*.bb \ -${PKGDIR}/packages/reiser4progs/*.bb \ -${PKGDIR}/packages/reiserfsprogs/*.bb \ -${PKGDIR}/packages/rsync/*.bb \ -${PKGDIR}/packages/samba/*.bb \ -${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ -${PKGDIR}/packages/sed/*.bb \ -${PKGDIR}/packages/setpwc/*.bb \ -${PKGDIR}/packages/setserial/*.bb \ -${PKGDIR}/packages/sgml-common/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/slugos-init/*.bb \ -${PKGDIR}/packages/spca5xx/*.bb \ -${PKGDIR}/packages/ssmtp/*.bb \ -${PKGDIR}/packages/strace/*.bb \ -${PKGDIR}/packages/streamripper/*.bb \ -${PKGDIR}/packages/subversion/*.bb \ -${PKGDIR}/packages/sudo/*.bb \ -${PKGDIR}/packages/sysfsutils/*.bb \ -${PKGDIR}/packages/syslog-ng/*.bb \ -${PKGDIR}/packages/sysvinit/*.bb \ -${PKGDIR}/packages/tar/*.bb \ -${PKGDIR}/packages/tcltk/*.bb \ -${PKGDIR}/packages/thttpd/*.bb \ -${PKGDIR}/packages/time/*.bb \ -${PKGDIR}/packages/timezones/*.bb \ -${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/uclibc/*.bb \ -${PKGDIR}/packages/udev/*.bb \ -${PKGDIR}/packages/unionfs/*.bb \ -${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/vim/*.bb \ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/vpnc/*.bb \ -${PKGDIR}/packages/vsftpd/*.bb \ -${PKGDIR}/packages/w3cam/*.bb \ -${PKGDIR}/packages/wakelan/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/whois/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/wpa-supplicant/*.bb \ -${PKGDIR}/packages/wview/*.bb \ -${PKGDIR}/packages/xlibs/*.bb \ -${PKGDIR}/packages/xextensions/*.bb \ -${PKGDIR}/packages/xinetd/*.bb \ -${PKGDIR}/packages/xproto/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${PKGDIR}/packages/zip/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${SLUGOS_EXTRA_BBFILES}" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c0401d93d3..a26a069fa0 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -3,28 +3,7 @@ #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 # WARNING: this file should not be used directly, use one of -# the supported slugos-???.conf instead: - -# Explanation of the naming -# -# slugos-dist - the base distro configuration for an NSLU2 -# slugos-[bl][at][gu] - a specific configuration encoded as follows: -# -# b or l - big or little endian -# -# a or t - ARM or Thumb instructions in the low level libraries -# set ARM_INSTRUCTION_SET to match -# -# g or u - glibc or uclibc libc implementation -# set TARGET_OS to match -# -# The following names are deprecated: -# -# openslug - the historical name of a canonical slugos-bag distro -# also the name of a standard slugos-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of slugos-btu -# also the name of a standard slugos-btu distro with a package feed -# +# the supported slugos-derived distributions instead. #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS @@ -33,6 +12,8 @@ # #DISTRO_NAME #DISTRO_TYPE +#ARM_INSTRUCTION_SET "arm" or "thumb" +#TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions SLUGOS_VERSION = "4.3" @@ -42,11 +23,7 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" -# The following must also be set, they define the basic format of the build -# -#ARM_INSTRUCTION_SET "arm" or "thumb" -#TARGET_OS "linux" or "linux-uclibc" -#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) +IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" @@ -62,21 +39,19 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" - -# packages/meta/slugos-image.bb generates a binary image of the root file system -# with a name controlled by the following setting - it defaults to the top level -# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. -# if you change the DISTRO from one of the standard ones in a way which does not -# change the generated image). -SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" +INHERIT += "package_ipk debian multimachine" -# pull in the frozen list of bbfiles - this sets BBFILES and this will override any -# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do -# anything by default unless conf/distro/${DISTRO}-packages.conf exists. -# require conf/distro/include/freeze.conf +# FULL_OPTIMIZATION +# Optimization settings. Os works fine and is significantly better than O2. +# The other settings are somewhat arbitrary. The optimisations chosen here +# include the ones which 'break' symbolic debugging (because the compiler does +# not include enough information to allow the debugger to know where given +# values are.) The -fno options are an attempt to cancel explicit use of space +# consuming options found in some packages (this isn't a complete list, this is +# just the ones which package writers seem to know about and abuse). +FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ + -fno-unroll-loops -fno-inline-functions \ + -fweb -funit-at-a-time" #---------------------------------------------------------------------------------- # FEEDS @@ -84,21 +59,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # when downloading new packages or updating existing packages. Additional feeds # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- -# Add to the user's feeds from local.conf (there may be none). -# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which -# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to -# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building -# such a feed: # -#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" -#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" -# -# When such a feed exists the corresponding 'unstable' feed will normally also -# exist - the packages in unstable are the latest but very unlikely to be the -# greatest. Use at your own risk! -# -#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" -#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION @@ -111,20 +74,6 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. Other options -# may later be defined for other vendor-flashable image types. -# -# If you do this you will need to find a source for the LinkSys software to be -# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch -# of bytes to flag the image as valid) and 'SysConf' (actually just a block of -# unset data - you could modify this to pre-configure the SysConf partition of the -# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 -# and you can download it (including new versions) from the LinkSys web site - see -# packages/meta/slugos-image.bb for information about where to put the downloaded -# data. -SLUGOS_FLASH_IMAGE ?= "no" - # EXTRA PACKAGES # -------------- # SlugOS builds an image with no extra packages - to add packages to the @@ -154,8 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# compiler/binary/library versions (unslung uses different ones so these -# cannot be in ${MACHINE}.conf) +# compiler/binary/library versions PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" @@ -189,6 +137,8 @@ SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" + PREFERRED_VERSION_ipkg ?= "0.99.154" PREFERRED_VERSION_ipkg-native ?= "0.99.154" diff --git a/conf/distro/include/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc deleted file mode 100644 index 3b3e9fca75..0000000000 --- a/conf/distro/include/ucslugc-packages.inc +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/unslung-packages.inc b/conf/distro/include/unslung-packages.inc deleted file mode 100644 index e889a65df5..0000000000 --- a/conf/distro/include/unslung-packages.inc +++ /dev/null @@ -1,41 +0,0 @@ -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/file/*.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/python/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${UNSLUNG_EXTRA_BBFILES}" |