diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/binconfig.bbclass | 13 | ||||
| -rw-r--r-- | classes/e.bbclass | 30 | ||||
| -rw-r--r-- | classes/efl.bbclass | 6 | ||||
| -rw-r--r-- | classes/image.bbclass (renamed from classes/image_ipk.bbclass) | 0 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 8 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 1 | ||||
| -rw-r--r-- | classes/wrt-image.bbclass | 2 |
7 files changed, 28 insertions, 32 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 317e080fc5..dadf2dddfc 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,11 +20,6 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s -# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages -def is_native(d): - import bb.data - return ["","-native"][bb.data.inherits_class('native', d)] - BINCONFIG_GLOB ?= "*-config" do_install_append() { @@ -52,9 +47,9 @@ do_install_append() { do_stage_append() { for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do - configname=`basename $config`${@is_native(d)} - install -d ${STAGING_BINDIR} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname - chmod u+x ${STAGING_BINDIR}/$configname + configname=`basename $config` + install -d ${STAGING_BINDIR_CROSS} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname + chmod u+x ${STAGING_BINDIR_CROSS}/$configname done } diff --git a/classes/e.bbclass b/classes/e.bbclass index ae8fea0d5d..f20c1f8b60 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -8,23 +8,19 @@ do_prepsources () { } addtask prepsources after do_fetch before do_unpack -def binconfig_suffix(d): - import bb - return ["","-native"][bb.data.inherits_class('native', d)] - -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" -export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" -export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" -export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" -export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" -export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" -export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" +export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" +export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config" +export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config" +export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config" +export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config" +export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config" +export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config" +export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" +export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' diff --git a/classes/efl.bbclass b/classes/efl.bbclass index be5ef9dcb0..9b0345a5b8 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -13,6 +13,10 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" +def efl_is_native(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + do_stage_append () { for i in ${libraries} do @@ -24,7 +28,7 @@ do_stage_append () { done # Install binaries automatically for native builds - if [ "${@binconfig_suffix(d)}" = "-native" ] + if [ "${@efl_is_native(d)}" = "-native" ] then # Most EFL binaries start with the package name diff --git a/classes/image_ipk.bbclass b/classes/image.bbclass index 2beb137aef..2beb137aef 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image.bbclass diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8020fd0ca3..9af23c7a73 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -2,7 +2,7 @@ # Creates a root filesystem out of IPKs # # This rootfs can be mounted via root-nfs or it can be put into an cramfs/jffs etc. -# See image_ipk.oeclass for a usage of this. +# See image.bbclass for a usage of this. # DEPENDS_prepend="ipkg-native ipkg-utils-native fakeroot-native " @@ -17,7 +17,7 @@ do_build[nostamp] = "1" IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" -IPKG_INSTALL += "ipkg ipkg-collateral" +PACKAGE_INSTALL += "ipkg ipkg-collateral" ROOTFS_POSTPROCESS_COMMAND ?= "" @@ -55,8 +55,8 @@ real_do_rootfs () { ipkg-cl ${IPKG_ARGS} install $i done fi - if [ ! -z "${IPKG_INSTALL}" ]; then - ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL} + if [ ! -z "${PACKAGE_INSTALL}" ]; then + ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL} fi export D=${IMAGE_ROOTFS} diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5a37768b52..f1671d9613 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -49,6 +49,7 @@ def get_siteinfo_list(d): if target in targetinfo: info = targetinfo[target].split() info.append(target) + info.append("common") return info else: bb.error("Information not available for target '%s'" % target) diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass index ba1163a719..45d9ac923f 100644 --- a/classes/wrt-image.bbclass +++ b/classes/wrt-image.bbclass @@ -3,7 +3,7 @@ ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*" def wrt_get_kernel_version(d): import bb - if bb.data.inherits_class('image_ipk', d): + if bb.data.inherits_class('image', d): skd = bb.data.getVar('STAGING_KERNEL_DIR', d, 1) return base_read_file(skd+'/kernel-abiversion') return "-no kernel version for available-" |