[PATCH][meta-oe][v3] phoronix-test-suite: uprev it to 6.0.1

[PATCH][meta-oe][v3] phoronix-test-suite: uprev it to 6.0.1

[rongqing.li]

From: Roy Li <rongqing.li@windriver.com>

1. inherit systemd and move the systemd unit files to correct dir
2. inherit allarch
3. add bash/python to RDEDEPENDS

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 ...-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} (56%)

diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
similarity index 56%
rename from meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
rename to meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
index ef9f735..6b16887 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
@@ -6,19 +6,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "console/tests"
 
 SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz"
-SRC_URI[md5sum] = "51e52d883710dc516c5494bd1c377219"
-SRC_URI[sha256sum] = "1186f460691e2fe7a07df5edb8d8ed1ac0c65327512e646da2b2e3a60dda6cd9"
+SRC_URI[md5sum] = "c3b26fcc57a3a253e558f759fdc1089f"
+SRC_URI[sha256sum] = "27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
 S = "${WORKDIR}/phoronix-test-suite"
 
+inherit systemd
+
 do_install() {
 	DESTDIR=${D} ./install-sh ${exec_prefix}
+
+	if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+		if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then
+			install -d ${D}/${systemd_unitdir}/system/
+			mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/
+			rm -rf ${D}/usr/lib/
+		fi
+	else
+		rm -rf ${D}/usr/lib/
+	fi
 }
 
-RDEPENDS_${PN} = "php-cli"
+SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
+RDEPENDS_${PN} += "bash python php-cli"
+
 FILES_${PN} += " \
 	${datadir}/phoronix-test-suite \
 	${datadir}/appdata/phoronix-test-suite.appdata.xml \
 	${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \
 	${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
 	${datadir}/mime/packages/openbenchmarking-mime.xml \
+	${systemd_unitdir}/* \
 "
-- 
1.9.1

Re: [PATCH][meta-oe][v3] phoronix-test-suite: uprev it to 6.0.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3057 bytes --]

On Wed, Dec 16, 2015 at 03:44:36PM +0800, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
> 
> 1. inherit systemd and move the systemd unit files to correct dir
> 2. inherit allarch
> 3. add bash/python to RDEDEPENDS

v2 was merged today, can you please rebase and resend follow-up with
changes from v3?

> 
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>  ...-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} | 21 ++++++++++++++++++---
>  1 file changed, 18 insertions(+), 3 deletions(-)
>  rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} (56%)
> 
> diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> similarity index 56%
> rename from meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
> rename to meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> index ef9f735..6b16887 100644
> --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
> +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> @@ -6,19 +6,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>  SECTION = "console/tests"
>  
>  SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz"
> -SRC_URI[md5sum] = "51e52d883710dc516c5494bd1c377219"
> -SRC_URI[sha256sum] = "1186f460691e2fe7a07df5edb8d8ed1ac0c65327512e646da2b2e3a60dda6cd9"
> +SRC_URI[md5sum] = "c3b26fcc57a3a253e558f759fdc1089f"
> +SRC_URI[sha256sum] = "27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
>  S = "${WORKDIR}/phoronix-test-suite"
>  
> +inherit systemd
> +
>  do_install() {
>  	DESTDIR=${D} ./install-sh ${exec_prefix}
> +
> +	if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> +		if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then
> +			install -d ${D}/${systemd_unitdir}/system/
> +			mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/
> +			rm -rf ${D}/usr/lib/
> +		fi
> +	else
> +		rm -rf ${D}/usr/lib/
> +	fi
>  }
>  
> -RDEPENDS_${PN} = "php-cli"
> +SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
> +RDEPENDS_${PN} += "bash python php-cli"
> +
>  FILES_${PN} += " \
>  	${datadir}/phoronix-test-suite \
>  	${datadir}/appdata/phoronix-test-suite.appdata.xml \
>  	${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \
>  	${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
>  	${datadir}/mime/packages/openbenchmarking-mime.xml \
> +	${systemd_unitdir}/* \
>  "
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]