* [PATCH] qemu: Upgrade to 1.3.1 @ 2013-02-13 7:46 Khem Raj 2013-02-13 7:46 ` [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units Khem Raj 2013-02-13 18:44 ` [PATCH] qemu: Upgrade to 1.3.1 Saul Wold 0 siblings, 2 replies; 4+ messages in thread From: Khem Raj @ 2013-02-13 7:46 UTC (permalink / raw) To: openembedded-core qemu on target,qemu-native and nativesdk versions built and worked fine Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/qemu/qemu_1.3.0.bb | 10 ---------- meta/recipes-devtools/qemu/qemu_1.3.1.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu_1.3.0.bb create mode 100644 meta/recipes-devtools/qemu/qemu_1.3.1.bb diff --git a/meta/recipes-devtools/qemu/qemu_1.3.0.bb b/meta/recipes-devtools/qemu/qemu_1.3.0.bb deleted file mode 100644 index 7d007ea..0000000 --- a/meta/recipes-devtools/qemu/qemu_1.3.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" -SRC_URI[md5sum] = "a4030ddd2ba324152a97d65d3c0b247d" -SRC_URI[sha256sum] = "878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8" - -PR = "r0" diff --git a/meta/recipes-devtools/qemu/qemu_1.3.1.bb b/meta/recipes-devtools/qemu/qemu_1.3.1.bb new file mode 100644 index 0000000..9ac7027 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu_1.3.1.bb @@ -0,0 +1,9 @@ +require qemu.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" + +SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" +SRC_URI[md5sum] = "5dbc6c22f47efca71dfaae0dd80dcf9e" +SRC_URI[sha256sum] = "3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf" + -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units 2013-02-13 7:46 [PATCH] qemu: Upgrade to 1.3.1 Khem Raj @ 2013-02-13 7:46 ` Khem Raj 2013-02-13 16:53 ` Burton, Ross 2013-02-13 18:44 ` [PATCH] qemu: Upgrade to 1.3.1 Saul Wold 1 sibling, 1 reply; 4+ messages in thread From: Khem Raj @ 2013-02-13 7:46 UTC (permalink / raw) To: openembedded-core systemd always uses /lib and /usr/lib to store unit files so using libdir and base_libdir is incorrect. It will work where libdir is usr/lib and base_libdir is /lib but wont work when say its /lib64 Add a check to make sure that SYSTEMD_PACKAGES are part of PACKAGES too, otherwise error out Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/classes/systemd.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 8b55813..269e3f9 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -49,6 +49,12 @@ python systemd_populate_packages() { val = (d.getVar(var, True) or "").strip() return val + # Check if systemd-packages already included in PACKAGES + def systemd_check_package(pkg_systemd): + packages = d.getVar('PACKAGES', True) + if not pkg_systemd in packages: + bb.error('%s does not appear in package list, please add it', " " + pkg_systemd) + # Add a runtime dependency on systemd to pkg def systemd_add_rdepends(pkg): @@ -118,11 +124,9 @@ python systemd_populate_packages() { # Check service-files and call systemd_add_files_and_parse for each entry def systemd_check_services(): - base_libdir = d.getVar('base_libdir', True) searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),] - searchpaths.append(oe.path.join(d.getVar("base_libdir", True), "systemd", "system")) - searchpaths.append(oe.path.join(d.getVar("libdir", True), "systemd", "system")) - searchpaths.append(oe.path.join(d.getVar("libdir", True), "systemd", "user")) + searchpaths.append(oe.path.join(d.getVar("nonarch_base_libdir", True), "systemd", "system")) + searchpaths.append(oe.path.join(d.getVar("exec_prefix", True), d.getVar("nonarch_base_libdir", True), "systemd", "system")) systemd_packages = d.getVar('SYSTEMD_PACKAGES', True) has_exactly_one_service = len(systemd_packages.split()) == 1 if has_exactly_one_service: @@ -149,6 +153,7 @@ python systemd_populate_packages() { # Run all modifications once when creating package if os.path.exists(d.getVar("D", True)): for pkg in d.getVar('SYSTEMD_PACKAGES', True).split(): + systemd_check_package(pkg) if d.getVar('SYSTEMD_SERVICE_' + pkg, True): systemd_generate_package_scripts(pkg) systemd_add_rdepends(pkg) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units 2013-02-13 7:46 ` [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units Khem Raj @ 2013-02-13 16:53 ` Burton, Ross 0 siblings, 0 replies; 4+ messages in thread From: Burton, Ross @ 2013-02-13 16:53 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 13 February 2013 07:46, Khem Raj <raj.khem@gmail.com> wrote: > + packages = d.getVar('PACKAGES', True) > + if not pkg_systemd in packages: Should probably do packages.split() here to ensure that we don't match a substring. Ross ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] qemu: Upgrade to 1.3.1 2013-02-13 7:46 [PATCH] qemu: Upgrade to 1.3.1 Khem Raj 2013-02-13 7:46 ` [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units Khem Raj @ 2013-02-13 18:44 ` Saul Wold 1 sibling, 0 replies; 4+ messages in thread From: Saul Wold @ 2013-02-13 18:44 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 02/12/2013 11:46 PM, Khem Raj wrote: > qemu on target,qemu-native and nativesdk versions built > and worked fine > Already on the list and in MUT from Constantin Thanks Sau! > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-devtools/qemu/qemu_1.3.0.bb | 10 ---------- > meta/recipes-devtools/qemu/qemu_1.3.1.bb | 9 +++++++++ > 2 files changed, 9 insertions(+), 10 deletions(-) > delete mode 100644 meta/recipes-devtools/qemu/qemu_1.3.0.bb > create mode 100644 meta/recipes-devtools/qemu/qemu_1.3.1.bb > > diff --git a/meta/recipes-devtools/qemu/qemu_1.3.0.bb b/meta/recipes-devtools/qemu/qemu_1.3.0.bb > deleted file mode 100644 > index 7d007ea..0000000 > --- a/meta/recipes-devtools/qemu/qemu_1.3.0.bb > +++ /dev/null > @@ -1,10 +0,0 @@ > -require qemu.inc > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" > - > -SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" > -SRC_URI[md5sum] = "a4030ddd2ba324152a97d65d3c0b247d" > -SRC_URI[sha256sum] = "878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8" > - > -PR = "r0" > diff --git a/meta/recipes-devtools/qemu/qemu_1.3.1.bb b/meta/recipes-devtools/qemu/qemu_1.3.1.bb > new file mode 100644 > index 0000000..9ac7027 > --- /dev/null > +++ b/meta/recipes-devtools/qemu/qemu_1.3.1.bb > @@ -0,0 +1,9 @@ > +require qemu.inc > + > +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ > + file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" > + > +SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" > +SRC_URI[md5sum] = "5dbc6c22f47efca71dfaae0dd80dcf9e" > +SRC_URI[sha256sum] = "3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf" > + > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-13 19:00 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-02-13 7:46 [PATCH] qemu: Upgrade to 1.3.1 Khem Raj 2013-02-13 7:46 ` [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units Khem Raj 2013-02-13 16:53 ` Burton, Ross 2013-02-13 18:44 ` [PATCH] qemu: Upgrade to 1.3.1 Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox