diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 12 | ||||
| -rw-r--r-- | conf/distro/angstrom.conf | 2 | ||||
| -rw-r--r-- | conf/distro/slugos-packages.conf | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 68fbc0a473..2043a500eb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -315,12 +315,12 @@ APACHE_MIRROR = "http://www.apache.org/dist" # export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge" # into your local.conf -FETCHCOMMAND = "" +FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}" -RESUMECOMMAND = "" +RESUMECOMMAND = "ERROR, this must be a BitBake bug" RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" -UPDATECOMMAND = "" +UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" SRCDATE = "${DATE}" @@ -403,3 +403,9 @@ require conf/sanity.conf ################################################################## PCMCIA_MANAGER ?= "pcmcia-cs" + + +################################################################## +# Magic Cookie for SANITY CHECK +################################################################## +OES_BITBAKE_CONF = "1" diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 40f57430d0..a94fcee140 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -24,7 +24,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "" #Use the ARM EABI when building for an ARM cpu. We can't use overrides #here because this breaks all places where ":=" is used. -TARGET_VENDOR = "${@['','-none'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index ff34a1ab22..87ca470069 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -148,6 +148,7 @@ ${PKGDIR}/packages/minicom/*.bb \ ${PKGDIR}/packages/module-init-tools/*.bb \ ${PKGDIR}/packages/modutils/*.bb \ ${PKGDIR}/packages/monotone/*.bb \ +${PKGDIR}/packages/motion/*.bb \ ${PKGDIR}/packages/mt-daapd/*.bb \ ${PKGDIR}/packages/mtd/*.bb \ ${PKGDIR}/packages/musicpd/*.bb \ @@ -239,6 +240,7 @@ ${PKGDIR}/packages/vim/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/vpnc/*.bb \ ${PKGDIR}/packages/vsftpd/*.bb \ +${PKGDIR}/packages/w3cam/*.bb \ ${PKGDIR}/packages/wakelan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/whois/*.bb \ |