summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-06 22:39:32 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-06 22:39:32 +0000
commit6c97f56d28872da36cc0cc52631668985d8db22a (patch)
tree3957d53afc5c22540dedd5c61af13b28149a5b55 /conf/distro
parent3bcd16909c945940017ded43f94652f1a7acf2f5 (diff)
parent254167bc41a3aae1c45a5f769ec16dee2dd37e2e (diff)
merge of 5945a66a6847c21d25595376695c23f3971f6f8a
and e544df2d6779a2a53f1c47a6d1e1961d875d17af
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/debianslug.conf9
-rw-r--r--conf/distro/openslug.conf9
-rw-r--r--conf/distro/preferred-e-versions.inc42
-rw-r--r--conf/distro/slugos-packages.conf1
-rw-r--r--conf/distro/ucslugc.conf10
-rw-r--r--conf/distro/unslung.conf2
6 files changed, 50 insertions, 23 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index c5c9f6868c..1063356217 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
# This documents other file systems which are built but not installed
# by default in the flash image.
#
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 304cd6dcfa..09f3691b65 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
# This documents other file systems which are built but not installed
# by default in the flash image.
#
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index 53f363bf3d..c8f246ff69 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
# Specify which versions of E-related libraries and applications to build
#
-PREFERRED_VERSION_e = "0.16.999.023"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
-PREFERRED_VERSION_ecore-native = "0.9.9.023"
-PREFERRED_VERSION_edb = "1.0.5.005"
-PREFERRED_VERSION_edb-native = "1.0.5.005"
-PREFERRED_VERSION_edje = "0.5.0.023"
-PREFERRED_VERSION_edje-native = "0.5.0.023"
-PREFERRED_VERSION_eet = "0.9.10.023"
-PREFERRED_VERSION_eet-native = "0.9.10.023"
-PREFERRED_VERSION_embryo = "0.9.1.023"
-PREFERRED_VERSION_embryo-native = "0.9.1.023"
+PREFERRED_VERSION_e = "0.16.999.025"
+PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+PREFERRED_VERSION_ecore-native = "0.9.9.025"
+PREFERRED_VERSION_edb = "1.0.5.006"
+PREFERRED_VERSION_edb-native = "1.0.5.006"
+PREFERRED_VERSION_edje = "0.5.0.025"
+PREFERRED_VERSION_edje-native = "0.5.0.025"
+PREFERRED_VERSION_eet = "0.9.10.025"
+PREFERRED_VERSION_eet-native = "0.9.10.025"
+PREFERRED_VERSION_embryo = "0.9.1.025"
+PREFERRED_VERSION_embryo-native = "0.9.1.025"
PREFERRED_VERSION_emotion = "0.0.1.004"
PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.005"
-PREFERRED_VERSION_epsilon = "0.3.0.005"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
-PREFERRED_VERSION_evas-x11 = "0.9.9.023"
-PREFERRED_VERSION_evas-native = "0.9.9.023"
-PREFERRED_VERSION_ewl = "0.0.4.005"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
-PREFERRED_VERSION_imlib2-native = "1.2.1.010"
-PREFERRED_VERSION_e-wm = "0.16.999.023"
-PREFERRED_VERSION_entrance = "0.9.0.005"
+PREFERRED_VERSION_epeg = "0.9.0.006"
+PREFERRED_VERSION_epsilon = "0.3.0.006"
+PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+PREFERRED_VERSION_evas-native = "0.9.9.025"
+PREFERRED_VERSION_ewl = "0.0.4.006"
+PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+PREFERRED_VERSION_e-wm = "0.16.999.025"
+PREFERRED_VERSION_entrance = "0.9.0.006"
PREFERRED_PROVIDER_virtual/evas = "evas-x11"
PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 3ed8549418..b89d5728f7 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -169,7 +169,6 @@ ${PKGDIR}/packages/obexftp/*.bb \
${PKGDIR}/packages/openjade/*.bb \
${PKGDIR}/packages/openldap/*.bb \
${PKGDIR}/packages/openntpd/*.bb \
-${PKGDIR}/packages/openobex-apps/*.bb \
${PKGDIR}/packages/openobex/*.bb \
${PKGDIR}/packages/opensp/*.bb \
${PKGDIR}/packages/openssh/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 24ef6e6c33..bb6c6efa6a 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -19,6 +19,16 @@ UCSLUGC_EXTRA_BBFILES ?= ""
# 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.
UCSLUGC_EXTRA_RDEPENDS ?= ""
+
+UCSLUGC_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
#
SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index e961445209..1308340887 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.7-beta"
+DISTRO_VERSION = "6.8-beta"
DISTRO_TYPE = "beta"
FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"