diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-16 20:46:44 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-16 20:46:44 +0100 |
| commit | c80e42faffdc71e878168c52bb3767e2277dd722 (patch) | |
| tree | c24cedac802665648f2ac24bd184c772ca2e1460 /conf | |
| parent | b32e9132c3b7186605a8f58978bf74dbcf12e1f7 (diff) | |
| parent | 2eb99471ec5f9c49a99b7349395d7dda0aee6b91 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 12 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 | ||||
| -rw-r--r-- | conf/machine/bug.conf | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index de85d2b17b..8252329fd5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -14582,6 +14582,10 @@ sha256=448a4e35a8685b60829d1b51b498e2a6e4107549fd0458fa17dcc801d29d5f72 md5=d8ca3192867c98669bd7d6a41ed26b09 sha256=2cbce6d32c31c53df3e3f6fdd9d74c81b02ca1295598acd56061effa2b299b65 +[http://launchpad.net/libfreespace/0.4/0.4/+download/libfreespace-0.4.tar.gz] +md5=96a081e3b7fe2337344b8adc61259eb4 +sha256=cc1e5f6751e27b2f403e85d394312c283b74f55e095c8ed8a3327a23549263de + [http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-0.13.tar.gz] md5=7b4a660fd644980f3d45873d156d021a sha256=98ceb0a3174564f310c4ff1c021bdca52558bf693003a410cdb95c8388aa11f3 @@ -16346,6 +16350,10 @@ sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45 md5=dc8865eaff167aabe78e5799762b8067 sha256=9f5737019f3e4c14f68a2f829deb690330e89b634d1337683e453b94137669f1 +[http://downloads.sourceforge.net/libusb/libusb-1.0.4.tar.bz2] +md5=a1f2206f1b4bd800e2461157faaa887f +sha256=6de182e93c946d432ed04362f0b93d889072438448dad20a21d4fcfa34cffa1d + [http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2] md5=3d9f7c3966d24c6e2d58becac96e4e27 sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49 @@ -18302,6 +18310,10 @@ sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d md5=805e2e59a93a0a4b7652d6547b2bd923 sha256=97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a +[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.1.tar.bz2] +md5=3cee94c9a22316504a3ba99bc92e0245 +sha256=7d79a45331cfcf002ccd5a386b5597f91e0ee048b2b040a57c6faebc02bba79c + [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2] md5=d50f0a9683dee60685bcd48e04970949 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 903e5ed602..8a331ae7f2 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -143,6 +143,9 @@ SRCDATE_ipkg-utils-native ?= "20060106" SRCDATE_ipkg-link ?= "20060106" SRCDATE_irssi ?= "20050930" +# We want the newer util-linux package +PREFERRED_PROVIDER_util-linux ?= "util-linux-ng" + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf index cec3d5b785..3e0389a6ba 100644 --- a/conf/machine/bug.conf +++ b/conf/machine/bug.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the BUG base unit. TARGET_ARCH = "arm" -MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw" +MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw" PREFERRED_PROVIDER_virtual/kernel = "linux-bug" MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget" |