From fc187800710eb2a6f51f764695e3fd04c8267736 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 2 Apr 2006 12:16:29 +0000 Subject: kernel.bbclass: Make sure the directory in staging exists --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 471acd4a61..c5f667747c 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -163,6 +163,7 @@ kernel_do_install() { oe_runmake SUBDIRS="scripts/genksyms" fi + install -d ${STAGING_KERNEL_DIR} cp -fR scripts ${STAGING_KERNEL_DIR}/ } -- cgit v1.2.3 From 1a2a224fb962e22ccf948bbdc11fd9b6f5f335bc Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 4 Apr 2006 04:14:40 +0000 Subject: efl, e17: update to newest versions, split e and efl bbclasses and use e for e17 packages, update preferred e versions --- classes/e.bbclass | 40 ++++++++++++++++++++++++++++++++++++++++ classes/efl.bbclass | 40 ++++------------------------------------ 2 files changed, 44 insertions(+), 36 deletions(-) create mode 100644 classes/e.bbclass (limited to 'classes') diff --git a/classes/e.bbclass b/classes/e.bbclass new file mode 100644 index 0000000000..4485d1d847 --- /dev/null +++ b/classes/e.bbclass @@ -0,0 +1,40 @@ +MAINTAINER = "Justin Patrin " +HOMEPAGE = "http://www.enlightenment.org" +SECTION = "e/apps" + +inherit autotools pkgconfig binconfig + +do_prepsources () { + make clean distclean || true +} +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)}" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +} + +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e" +E_URI = "http://enlightenment.freedesktop.org/files" + +PACKAGES = "${PN} ${PN}-themes" +FILES_${PN} = "${libdir}/lib*.so*" +FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index e5968b9aec..9c490284c2 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -1,18 +1,11 @@ -MAINTAINER = "Justin Patrin " -HOMEPAGE = "http://www.enlightenment.org" +inherit e + SECTION = "e/libs" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools pkgconfig binconfig - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - INHIBIT_AUTO_STAGE_INCLUDES = "1" INHIBIT_NATIVE_STAGE_INSTALL = "1" @@ -20,29 +13,6 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" -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)}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - do_stage_append () { for i in ${libraries} do @@ -73,9 +43,7 @@ do_stage_append () { fi } -PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples " -FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples" FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" FILES_${PN}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From e7931fb2e81889bdd492d3ec3f9617ac402d260b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 4 Apr 2006 04:17:19 +0000 Subject: package.bbclass: deal with multiple copies of the same package in PACKAGES --- classes/package.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index d32cf53828..e0ab7ad27f 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -241,6 +241,16 @@ python populate_packages () { return 0 return (s[stat.ST_MODE] & stat.S_IEXEC) + pkgs = set() + packages_joined = "" + for pkg in packages.split(): + if pkg in pkgs: + bb.note("%s is listed in PACKAGES multiple times" % (pkg)) + else: + pkgs.add(pkg) + packages_joined = "%s %s" % (packages_joined, pkg) + packages = packages_joined + for pkg in packages.split(): localdata = bb.data.createCopy(d) root = os.path.join(workdir, "install", pkg) -- cgit v1.2.3 From c121ca2c7e3e41472a4c4e2837cac69c76df5a53 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 4 Apr 2006 17:36:51 +0000 Subject: disapproval of revision 'b7326fa2f47e0d1df4fc54428bf5d903b1042483' --- classes/package.bbclass | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index e0ab7ad27f..d32cf53828 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -241,16 +241,6 @@ python populate_packages () { return 0 return (s[stat.ST_MODE] & stat.S_IEXEC) - pkgs = set() - packages_joined = "" - for pkg in packages.split(): - if pkg in pkgs: - bb.note("%s is listed in PACKAGES multiple times" % (pkg)) - else: - pkgs.add(pkg) - packages_joined = "%s %s" % (packages_joined, pkg) - packages = packages_joined - for pkg in packages.split(): localdata = bb.data.createCopy(d) root = os.path.join(workdir, "install", pkg) -- cgit v1.2.3 From 14074512754b1a0e6c54d70de70279d24dd10f25 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 4 Apr 2006 19:00:19 +0000 Subject: base.bbclass: make oe_libinstall fix references to .la files in --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 21feaab6e6..340e5d91f8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi -- cgit v1.2.3