slugos: Removed the obsolete freeze-packages.inc stuff (but left freeze.inc itself...

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index f85b175..b2eaa39 100644 (file)
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -14,11 +14,6 @@ SLUGOS_IMAGENAME = "debianslug"
 # debianslug builds a complete image (not just the parts)
 SLUGOS_FLASH_IMAGE = "1"
 
-# NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to
-# the .bb files for the packages to build - see debianslug-packages.conf in this
-# directory
-DEBIANSLUG_EXTRA_BBFILES ?= ""
-
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
 #----------------------------------------------------------------------------------

diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc
deleted file mode 100644 (file)
index a4b9a67..0000000
--- 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 d41cb89..4c2c8b1 100644 (file)
--- 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 (file)
index 7f7a448..0000000
--- 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 (file)
index fe09a7b..0000000
--- 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 (file)
index 650368a..0000000
--- 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/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc
deleted file mode 100644 (file)
index 3b3e9fc..0000000
--- 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 (file)
index e889a65..0000000
--- 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}"

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 616298a..176b2e0 100644 (file)
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -14,11 +14,6 @@ SLUGOS_IMAGENAME = "openslug"
 # openslug builds a complete image (not just the parts)
 SLUGOS_FLASH_IMAGE = "1"
 
-# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
-# the .bb files for the packages to build - see ucslugc-packages.conf in this
-# directory
-OPENSLUG_EXTRA_BBFILES ?= ""
-
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
 #----------------------------------------------------------------------------------

diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index ba8a123..69e08af 100644 (file)
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -13,11 +13,6 @@ PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
 PREFERRED_VERSION_gcc-cross = "3.4.4"
 PREFERRED_VERSION_gcc = "3.4.4"
 
-# NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to
-# the .bb files for the packages to build - see ucslugc-packages.conf in this
-# directory
-UCSLUGC_EXTRA_BBFILES ?= ""
-
 # For compatibility with the old way of overriding these settings names with the
 # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
 # setting - either may be set in local.conf to override these values.

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index b25b94d..f7ea4de 100644 (file)
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -10,10 +10,6 @@ FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stabl
 FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
 FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
 
-# pull in the frozen list of bbfiles
-# UNSLUNG_EXTRA_BBFILES ?= ""
-# require conf/distro/include/freeze.inc
-
 TARGET_FPU = "soft"
 TARGET_OS = "linux"