* [PATCH][meta-oe 0/2] Pending patches from O.S. Systems' tree @ 2012-02-24 20:55 Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 1/2] openbox: add missing depends Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross Otavio Salvador 0 siblings, 2 replies; 7+ messages in thread From: Otavio Salvador @ 2012-02-24 20:55 UTC (permalink / raw) To: openembedded-devel The following changes since commit 2eaec194016ba357bb02db8859b2b3737d759865: meta-multimedia: initial add (2012-02-24 13:53:17 +0100) are available in the git repository at: git://github.com/OSSystems/meta-oe master https://github.com/OSSystems/meta-oe/tree/master Otavio Salvador (2): openbox: add missing depends systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross meta-oe/classes/systemd.bbclass | 72 ++++++++++---------- .../recipes-graphics/openbox/openbox_3.4.11.2.bb | 3 + 2 files changed, 39 insertions(+), 36 deletions(-) -- 1.7.2.5 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH][meta-oe 1/2] openbox: add missing depends 2012-02-24 20:55 [PATCH][meta-oe 0/2] Pending patches from O.S. Systems' tree Otavio Salvador @ 2012-02-24 20:55 ` Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross Otavio Salvador 1 sibling, 0 replies; 7+ messages in thread From: Otavio Salvador @ 2012-02-24 20:55 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- .../recipes-graphics/openbox/openbox_3.4.11.2.bb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb b/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb index 65349a1..e5d645d 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb @@ -1,8 +1,11 @@ DESCRIPTION = "openbox Window Manager" SECTION = "x11/wm" +DEPENDS = "glib-2.0 pango libxml2 virtual/libx11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r1" + SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ file://fix-dialog-buttons.patch;patch=1 \ file://fix-decorations.patch;patch=1" -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross 2012-02-24 20:55 [PATCH][meta-oe 0/2] Pending patches from O.S. Systems' tree Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 1/2] openbox: add missing depends Otavio Salvador @ 2012-02-24 20:55 ` Otavio Salvador 2012-02-25 1:44 ` Otavio Salvador 1 sibling, 1 reply; 7+ messages in thread From: Otavio Salvador @ 2012-02-24 20:55 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta-oe/classes/systemd.bbclass | 72 +++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index dd423b5..0329b90 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -28,40 +28,34 @@ systemctl disable ${SYSTEMD_SERVICE} def systemd_after_parse(d): def systemd_check_vars(): - bpn = d.getVar('BPN', 1) - # not for native / only at parse time - if d.getVar('BB_WORKERCONTEXT', True) is None and \ - bpn + "-native" != d.getVar('PN', 1) and \ - bpn + "-cross" != d.getVar('PN', 1) and \ - bpn + "-nativesdk" != d.getVar('PN', 1): - bb_filename = d.getVar('FILE') - packages = d.getVar('PACKAGES', 1) - - # check SYSTEMD_PACKAGES - systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or "" - if systemd_pkgs == "": - raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename - for pkg_systemd in systemd_pkgs.split(): - if pkg_systemd.find("-systemd") == -1: - if pkg_systemd != d.getVar('PN', 1): - raise bb.build.FuncFailed, \ - "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ - (bb_filename, pkg_systemd) - else: - bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename) + bb_filename = d.getVar('FILE') + packages = d.getVar('PACKAGES', 1) + + # check SYSTEMD_PACKAGES + systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or "" + if systemd_pkgs == "": + raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename + for pkg_systemd in systemd_pkgs.split(): + if pkg_systemd.find("-systemd") == -1: + if pkg_systemd != d.getVar('PN', 1): + raise bb.build.FuncFailed, \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ + (bb_filename, pkg_systemd) else: - pkg_systemd_base = pkg_systemd.replace('-systemd', '') - if pkg_systemd_base not in packages: - raise bb.build.FuncFailed, \ - "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ - ( bb_filename, pkg_systemd) - - # check SYSTEMD_SERVICE - for pkg_systemd in systemd_pkgs.split(): - service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd - systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" - if systemd_services == "": - raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_SERVICE / %s" % (bb_filename, service_pkg) + bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename) + else: + pkg_systemd_base = pkg_systemd.replace('-systemd', '') + if pkg_systemd_base not in packages: + raise bb.build.FuncFailed, \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ + ( bb_filename, pkg_systemd) + + # check SYSTEMD_SERVICE + for pkg_systemd in systemd_pkgs.split(): + service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd + systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" + if systemd_services == "": + raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_SERVICE / %s" % (bb_filename, service_pkg) # prepend systemd-packages not already included def systemd_create_package(pkg_systemd): @@ -71,9 +65,15 @@ def systemd_after_parse(d): d.setVar('PACKAGES', packages) - systemd_check_vars() - for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): - systemd_create_package(pkg_systemd) + bpn = d.getVar('BPN', 1) + # not for native / only at parse time + if d.getVar('BB_WORKERCONTEXT', True) is None and \ + bpn + "-native" != d.getVar('PN', 1) and \ + bpn + "-cross" != d.getVar('PN', 1) and \ + bpn + "-nativesdk" != d.getVar('PN', 1): + systemd_check_vars() + for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): + systemd_create_package(pkg_systemd) python __anonymous() { -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross 2012-02-24 20:55 ` [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross Otavio Salvador @ 2012-02-25 1:44 ` Otavio Salvador 2012-02-25 2:33 ` Otavio Salvador 0 siblings, 1 reply; 7+ messages in thread From: Otavio Salvador @ 2012-02-25 1:44 UTC (permalink / raw) To: openembedded-devel On Fri, Feb 24, 2012 at 18:55, Otavio Salvador <otavio@ossystems.com.br> wrote: > meta-oe/classes/systemd.bbclass | 72 +++++++++++++++++++------------------- > 1 files changed, 36 insertions(+), 36 deletions(-) This broke it; I am fixing it and will send a patch soon. -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross 2012-02-25 1:44 ` Otavio Salvador @ 2012-02-25 2:33 ` Otavio Salvador 2012-02-26 12:06 ` Andreas Müller 0 siblings, 1 reply; 7+ messages in thread From: Otavio Salvador @ 2012-02-25 2:33 UTC (permalink / raw) To: openembedded-devel On Fri, Feb 24, 2012 at 23:44, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Fri, Feb 24, 2012 at 18:55, Otavio Salvador <otavio@ossystems.com.br> wrote: >> meta-oe/classes/systemd.bbclass | 72 +++++++++++++++++++------------------- >> 1 files changed, 36 insertions(+), 36 deletions(-) > > This broke it; I am fixing it and will send a patch soon. I ended sending two patches to fix this. The second one is the right to be take since it fix the packaging and parsing. Sorry by this mistake. -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross 2012-02-25 2:33 ` Otavio Salvador @ 2012-02-26 12:06 ` Andreas Müller 2012-02-27 11:22 ` Otavio Salvador 0 siblings, 1 reply; 7+ messages in thread From: Andreas Müller @ 2012-02-26 12:06 UTC (permalink / raw) To: openembedded-devel On Sat, Feb 25, 2012 at 3:33 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Fri, Feb 24, 2012 at 23:44, Otavio Salvador <otavio@ossystems.com.br> wrote: >> On Fri, Feb 24, 2012 at 18:55, Otavio Salvador <otavio@ossystems.com.br> wrote: >>> meta-oe/classes/systemd.bbclass | 72 +++++++++++++++++++------------------- >>> 1 files changed, 36 insertions(+), 36 deletions(-) >> >> This broke it; I am fixing it and will send a patch soon. > > I ended sending two patches to fix this. The second one is the right > to be take since it fix the packaging and parsing. Sorry by this > mistake. > I was about to send a revert - but it's too late now -because I haven't understood what the original patch is for. Could you please tell us what it fixes / enhances? Andreas ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross 2012-02-26 12:06 ` Andreas Müller @ 2012-02-27 11:22 ` Otavio Salvador 0 siblings, 0 replies; 7+ messages in thread From: Otavio Salvador @ 2012-02-27 11:22 UTC (permalink / raw) To: openembedded-devel On Sun, Feb 26, 2012 at 09:06, Andreas Müller <schnitzeltony@googlemail.com> wrote: > I was about to send a revert - but it's too late now -because I > haven't understood what the original patch is for. Could you please > tell us what it fixes / enhances? The parsing where being properly skipped in case of native, nativesdk and cross however the packaging addition not; so it ended up trying to build cross and native packages; in my case it broken an internal package that is built using chicken and is cross. -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-02-27 11:31 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-02-24 20:55 [PATCH][meta-oe 0/2] Pending patches from O.S. Systems' tree Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 1/2] openbox: add missing depends Otavio Salvador 2012-02-24 20:55 ` [PATCH][meta-oe 2/2] systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross Otavio Salvador 2012-02-25 1:44 ` Otavio Salvador 2012-02-25 2:33 ` Otavio Salvador 2012-02-26 12:06 ` Andreas Müller 2012-02-27 11:22 ` Otavio Salvador
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.