diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-10 14:22:58 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-10 14:22:58 +0400 |
| commit | aa4809089003d79ee0e1232cc5aed57c3a81e19d (patch) | |
| tree | 868098c884ff7c439fc21de6c26aa61f835a415d /conf | |
| parent | 850ac8ea316b4b4543cdda0789972c111ae301cc (diff) | |
| parent | 5e910c56c38255f8d9745d1901e7faa97f918648 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 660aa5a484..26c217ab95 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8606,6 +8606,10 @@ sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb md5=c1eb3de26b67ddc08a61a7c2fc636203 sha256=36480bce862b6d424f4b34bbfeed838b80bcbb484602dee43c412a7d0dc4b42b +[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.1.tar.gz] +md5=f0721c5dce7cb02c75ac4e7bb9cc0ec9 +sha256=a12b0fcd08508a85ee7ec7003ec0f3418378d479304ce85e8453d46bacc0ce9f + [ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz] md5=9d91d0f8f2cb35bc86435784fa8e72d8 sha256=a780490056b1f1f95c7bf91e175773e00f4be23e1b7e5147ccd507b6f32097af diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index fb036c10e8..903e5ed602 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -127,9 +127,11 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -# Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -SRCDATE_diet-x11 ?= "20060106" +# Select the appropriate x11 library provider. The diet-x11 libraries are +# much smaller, but may not be as current as the standard x11 libraries; by +# default we will select the standard libraries and permit the use of an +# override if the user wishes (and has the correct PREFERRED_VERSIONs set). +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" # Ensure consistency across all SlugOS builds for the provider of a relational # database - use the latest version of the SleepyCat Berkeley database |