diff options
122 files changed, 2339 insertions, 14266 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index ec1d4af1a4..8d448ce0d3 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -150,4 +150,16 @@ autotools_stage_includes() { fi } +autotools_stage_all() { + if [ "${INHIBIT_AUTO_STAGE}" != "1" ] + then + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + rm -rf ${STAGE_TEMP} + fi +} + EXPORT_FUNCTIONS do_configure do_install diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 1023a1f800..09b9cbac96 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,4 +1,3 @@ -DEPENDS += "qt3-x11" # # override variables set by qmake-base to compile Qt/X11 apps # diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 92885aa7ee..d4ca0073df 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,4 +1,3 @@ -DEPENDS += "qt4-x11" # # override variables set by qmake-base to compile Qt/X11 apps # 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 |