qemu: Upgrade to 1.3.1
PATCH 1/1 qemu: Upgrade to 1.3.1
qemu on target,qemu-native and nativesdk versions built and worked fine
--- 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
meta/recipes-devtools/qemu/qemu_1.3.0.bb deleted +0 -10
@@ -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"
meta/recipes-devtools/qemu/qemu_1.3.1.bb new file +9 -0
@@ -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" +
Signature · 1 line
1.7.9.5
PATCH v2 1/1 systemd.bbclass: Dont use libdir and base_libdir for units
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
--- meta/classes/systemd.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
meta/classes/systemd.bbclass +9 -4
@@ -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)
Signature · 1 line
1.7.9.5
Re: [PATCH V2] systemd.bbclass: Dont use libdir and base_libdir for units
meta/classes/systemd.bbclass python systemd_populate_packages() { · line 55
Quoted 2 lines · Khem Raj
meta/classes/systemd.bbclass +2
-0+ 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
Quoted 3 lines · Khem Raj
qemu on target,qemu-native and nativesdk versions built and worked fine
Already on the list and in MUT from Constantin
Thanks
Sau!
Quoted 40 lines
Signed-off-by Khem Raj <[email protected]>--- 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
meta/recipes-devtools/qemu/qemu_1.3.0.bb deleted +0
-10@@ -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"meta/recipes-devtools/qemu/qemu_1.3.1.bb new file +9
-0@@ -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" +