Signed-off-by: Saul Wold <s...@linux.intel.com> --- .../conf-files/conf-files}/pointercal.xinput | 0 .../xinput-calibrator/pointercal-xinput_0.0.bb | 20 -------------------- .../xinput-calibrator/xinput-calibrator_git.bb | 3 +-- 3 files changed, 1 insertion(+), 22 deletions(-) rename meta/{recipes-graphics/xinput-calibrator/pointercal-xinput => recipes-bsp/conf-files/conf-files}/pointercal.xinput (100%) delete mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-bsp/conf-files/conf-files/pointercal.xinput similarity index 100% rename from meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput rename to meta/recipes-bsp/conf-files/conf-files/pointercal.xinput diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb deleted file mode 100644 index 65348c3..0000000 --- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Touchscreen calibration data from xinput-calibrator" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PR = "r7" - -SRC_URI = "file://pointercal.xinput" -S = "${WORKDIR}" - -do_install() { - # Only install file if it has a contents - if [ -s ${S}/pointercal.xinput ] &&\ - [ ! -n "$(head -n1 ${S}/pointercal.xinput|grep "replace.*pointercal\.xinput")" ]; then - install -d ${D}${sysconfdir}/ - install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ - fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 562434f..65506e3 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxi" PV = "0.7.5+git${SRCPV}" PR = "r6" -inherit autotools pkgconfig +inherit autotools pkgconfig conf-files SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ @@ -32,4 +32,3 @@ do_install_append() { FILES_${PN} += "${sysconfdir}/xdg/autostart" RDEPENDS_${PN} = "xinput formfactor" -RRECOMMENDS_${PN} = "pointercal-xinput" -- 1.8.3.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core