diff options
| author | Mustafa Yuecel <yuecelm@ee.ethz.ch> | 2005-09-06 13:17:02 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-06 13:17:02 +0000 |
| commit | 2b755fd1472d2ad0412e841713100690f61600ce (patch) | |
| tree | 8f94f5bb5e0e74fec91699d358a05eb42d2a36b6 | |
| parent | fb3b9727d6e690ad7ad1c694ffaf932b0b5b27bd (diff) | |
| parent | 6236aaad0e8fe49c61d8230220fa2ed429c3eaf7 (diff) | |
merge of 111dbb3712f3bbac846e3e549eb3c6e357055206
and c0ba0c807efb6a1e8cc5c794ef33c6a91e35c2af
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 1 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 15 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs_2.6.2.bb | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index a45c396c8b..d17b059724 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -147,6 +147,7 @@ ${PKGDIR}/packages/uclibc/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ +${PKGDIR}/packages/upslug/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wakelan/*.bb \ diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 9239e676c7..b71352d070 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -108,12 +108,17 @@ IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" # the flash file system ('turnup' will not work). You need to add the filesystem # modules for your chosen root file system (and any others which will be used). # See openslug.conf for a more full-featured system! -UCLIBC_EXTRA_RDEPENDS ?= "" -UCLIBC_EXTRA_DEPENDS ?= "" -#UCLIBC_EXTRA_BBFILES above may also need to be set +UCSLUGC_EXTRA_RDEPENDS ?= "" +UCSLUGC_EXTRA_DEPENDS ?= "" +#USLUGC_EXTRA_BBFILES above may also need to be set -OPENSLUG_EXTRA_INSTALL = "${UCLIBC_EXTRA_RDEPENDS}" -OPENSLUG_EXTRA_DEPENDS = "${UCLIBC_EXTRA_DEPENDS}" +# These depends define native utilities - they do not get put in the flash. +# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash +# Override this as desired - it makes no difference to the final image. +UCSLUGC_NATIVE_DEPENDS ?= "upslug2-native" + +OPENSLUG_EXTRA_INSTALL = "${UCSLUGC_EXTRA_RDEPENDS}" +OPENSLUG_EXTRA_DEPENDS = "${UCSLUGC_EXTRA_DEPENDS} ${UCSLUGC_NATIVE_DEPENDS}" #---------------------------------------------------------------------------------- # PACKAGE VERSION CONTROL diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index 5e98e9e0d6..045a281676 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -6,7 +6,7 @@ RPROVIDES = "gnome-vfs" inherit gnome pkgconfig -DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14" +DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a" RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb index a9df875a1a..7bef148ff2 100644 --- a/packages/gnome/gnome-vfs_2.6.2.bb +++ b/packages/gnome/gnome-vfs_2.6.2.bb @@ -3,7 +3,7 @@ PR = "r4" inherit gnome -DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba" +DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba-3.0.14a" RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" |