diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/familiar-0.8.3.conf | 3 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 7 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.7.inc | 2 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 90f69dba0d..53614d9291 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -4,6 +4,9 @@ DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}" include conf/distro/familiar.conf +"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" + + DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 5c57e878c2..3d0f4867c8 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -89,10 +89,11 @@ OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs" OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}" -# These lines add a build of the 'upslug' program which may be +# These lines add a build of the 'upslug2' program which may be # used to download the final image to an NSLU2. The program can -# be found within the tmp/work/upslug-native* directory. -OPENSLUG_STANDARD_DEPENDS += "upslug-native" +# be found within the staging/<host>/bin directory. It must +# be run as root but may be safely installed setuid root. +OPENSLUG_STANDARD_DEPENDS += "upslug2-native" # These lines add support for an X/Y/ZModem package called lrzsz # (this is of use for people with modified NSLU2 hardware which diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 88a4fc0e34..17fe3ed9a9 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -27,7 +27,7 @@ PREFERRED_VERSION_libgpewidget ?= "0.103" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.12" PREFERRED_VERSION_libschedule ?= "0.15" -PREFERRED_VERSION_gpe-icons ?= "0.24" +PREFERRED_VERSION_gpe-icons ?= "0.25" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" PREFERRED_VERSION_xproto ?= "6.6.2" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index b17f9a4b3c..5a87441a2b 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -67,7 +67,8 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # uClibc does not include sinf or cosf, so the gcc auto-use of # these functions must be disabled (this only occurs with -O) -FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos" +#This should be fixed in uclibc 0.9.28 and later +#FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos" #------------------------------------------------------------------------------- # 'ARCH' options - package architecture and the 'target' architecture |