[oe-commits] org.oe.dev slugos: Removed the obsolete freeze-packages.inc stuff (but left freeze.inc itself there in case any other distro is still using it).

[rwhitby commit]

slugos: Removed the obsolete freeze-packages.inc stuff (but left freeze.inc itself there in case any other distro is still using it).

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 856725f840b0adb5dd7daedc821ee9cd8a9978ef
ViewMTN: http://monotone.openembedded.org/revision.psp?id=856725f840b0adb5dd7daedc821ee9cd8a9978ef
Files:
1
conf/distro/include/debianslug-packages.inc
conf/distro/include/openslug-native-packages.inc
conf/distro/include/openslug-packages.inc
conf/distro/include/slugos-packages.inc
conf/distro/include/ucslugc-packages.inc
conf/distro/include/unslung-packages.inc
conf/distro/debianslug.conf
conf/distro/include/freeze.inc
conf/distro/openslug.conf
conf/distro/ucslugc.conf
conf/distro/unslung.conf
Diffs:

#
# mt diff -r5e4ea63ef779e01c77462655d839bcb34f6de0e6 -r856725f840b0adb5dd7daedc821ee9cd8a9978ef
#
# 
# 
# delete "conf/distro/include/debianslug-packages.inc"
# 
# delete "conf/distro/include/openslug-native-packages.inc"
# 
# delete "conf/distro/include/openslug-packages.inc"
# 
# delete "conf/distro/include/slugos-packages.inc"
# 
# delete "conf/distro/include/ucslugc-packages.inc"
# 
# delete "conf/distro/include/unslung-packages.inc"
# 
# patch "conf/distro/debianslug.conf"
#  from [e1660e2028a0b188963536ad35b1d3912dd46574]
#    to [af27797b54954f723aab903c15c1b511f27f6ac3]
# 
# patch "conf/distro/include/freeze.inc"
#  from [8d7cd3c2efe5bf2c6cd0fd79f776486525411e9d]
#    to [a2a5efed2d89d35afb9ababf9691eb85768bf869]
# 
# patch "conf/distro/openslug.conf"
#  from [1f1752f121c41c9671323bcc4b257cf675c1f55b]
#    to [5e2efe976eaf438e8be9044afa3cb1a3b9d27f75]
# 
# patch "conf/distro/ucslugc.conf"
#  from [c6a8f0f2103720cec4c21f096052520134bee9ac]
#    to [81a66eb9a8c934679c029a1ddf39809713d49c48]
# 
# patch "conf/distro/unslung.conf"
#  from [e7cf3ca49dc8539f8acfa18e2674220590caf1b3]
#    to [08c7f1f9e3e5e1809e95cdcd317e1bd68eef3047]
# 
============================================================
--- conf/distro/debianslug.conf	e1660e2028a0b188963536ad35b1d3912dd46574
+++ conf/distro/debianslug.conf	af27797b54954f723aab903c15c1b511f27f6ac3
@@ -14,11 +14,6 @@ SLUGOS_FLASH_IMAGE = "1"
 # 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
 #----------------------------------------------------------------------------------
============================================================
--- conf/distro/include/freeze.inc	8d7cd3c2efe5bf2c6cd0fd79f776486525411e9d
+++ conf/distro/include/freeze.inc	a2a5efed2d89d35afb9ababf9691eb85768bf869
@@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory
 
 # 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
============================================================
--- conf/distro/openslug.conf	1f1752f121c41c9671323bcc4b257cf675c1f55b
+++ conf/distro/openslug.conf	5e2efe976eaf438e8be9044afa3cb1a3b9d27f75
@@ -14,11 +14,6 @@ SLUGOS_FLASH_IMAGE = "1"
 # 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
 #----------------------------------------------------------------------------------
============================================================
--- conf/distro/ucslugc.conf	c6a8f0f2103720cec4c21f096052520134bee9ac
+++ conf/distro/ucslugc.conf	81a66eb9a8c934679c029a1ddf39809713d49c48
@@ -13,11 +13,6 @@ PREFERRED_VERSION_gcc = "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.
============================================================
--- conf/distro/unslung.conf	e7cf3ca49dc8539f8acfa18e2674220590caf1b3
+++ conf/distro/unslung.conf	08c7f1f9e3e5e1809e95cdcd317e1bd68eef3047
@@ -10,10 +10,6 @@ FEED_URIS += "oe##http://ipkg.nslu2-linu
 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"