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

[Martin Jansa <martin.jansa@gmail.com>]

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

On Thu, Nov 26, 2015 at 01:13:41PM +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/php-cli to RDEDEPENDS

Rebased and resend with -M


OE @ ~/meta-openembedded $ pwam 108619
2015-12-11 14:55:45 URL:http://patchwork.openembedded.org/patch/108619/mbox/ [3926] -> "pw-am-108619.patch" [1]
Applying: phoronix-test-suite: uprev it to 6.0.1
error: patch failed: meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb:1
error: meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb: patch does not apply
Patch failed at 0001 phoronix-test-suite: uprev it to 6.0.1
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


> 
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>  .../phoronix-test-suite_5.2.1.bb                   | 24 ----------------
>  .../phoronix-test-suite_6.0.1.bb                   | 33 ++++++++++++++++++++++
>  2 files changed, 33 insertions(+), 24 deletions(-)
>  delete mode 100644 meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
>  create mode 100644 meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> 
> 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_5.2.1.bb
> deleted file mode 100644
> index 0fc5e8d..0000000
> --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -SUMMARY = "Phoronix Test Suite"
> -DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \
> -and quantitative benchmarks in a clean, reproducible, and easy-to-use manner."
> -LICENSE = "GPLv3"
> -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"
> -S = "${WORKDIR}/phoronix-test-suite"
> -
> -do_install() {
> -	DESTDIR=${D} ./install-sh ${exec_prefix}
> -}
> -
> -#RDEPENDS_${PN} = "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 \
> -"
> diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> new file mode 100644
> index 0000000..7f617ce
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
> @@ -0,0 +1,33 @@
> +SUMMARY = "Phoronix Test Suite"
> +DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \
> +and quantitative benchmarks in a clean, reproducible, and easy-to-use manner."
> +LICENSE = "GPLv3"
> +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] = "c3b26fcc57a3a253e558f759fdc1089f"
> +SRC_URI[sha256sum] = "27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
> +S = "${WORKDIR}/phoronix-test-suite"
> +
> +
> +inherit systemd allarch
> +
> +do_install() {
> +	DESTDIR=${D} ./install-sh ${exec_prefix}
> +        install -d ${D}/${systemd_unitdir}/system/
> +        mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/
> +        rm -rf ${D}/usr/lib/
> +}
> +
> +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}/system/* \
> +"
> -- 
> 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 --]