From d55adc243fed56d103ce0ca762d12bf6a9682598 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 10 Jan 2015 11:46:17 +0100 Subject: recipes: don't use ${PN} as a recipe name placeholder ${PN} might be extended with some magic prefix, so don't use it in SRC_URI assignments et. al. --- recipes-browser/chromium/chromium_24.0.1312.52.bbappend | 2 +- recipes-connectivity/connman/connman_%.bbappend | 2 +- recipes-graphics/unclutter/unclutter_1.09.bb | 4 ++-- recipes-graphics/vnc/tightvnc_1.3.10.bb | 2 +- recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend | 2 +- recipes-lxde/lxde-common/lxde-common_%.bbappend | 2 +- recipes-lxde/lxdm/lxdm_git.bbappend | 2 +- recipes-mozilla/firefox/firefox_10.0.11esr.bbappend | 5 ++--- recipes-multimedia/codecgraph/codecgraph_20120114.bb | 4 ++-- recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend | 2 +- recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bbappend | 2 +- recipes/base-files/base-files_3.0.14.bbappend | 2 +- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/recipes-browser/chromium/chromium_24.0.1312.52.bbappend b/recipes-browser/chromium/chromium_24.0.1312.52.bbappend index 5a282fb..1e16e7a 100644 --- a/recipes-browser/chromium/chromium_24.0.1312.52.bbappend +++ b/recipes-browser/chromium/chromium_24.0.1312.52.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/chromium-${PV}:" EXTRA_OEGYP_prepend = "-DUSE_EABI_HARDFLOAT=1" diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 8eef424..851b00d 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/connman:" SRC_URI += " \ file://dont_start_connman_on_nfsboot.patch \ diff --git a/recipes-graphics/unclutter/unclutter_1.09.bb b/recipes-graphics/unclutter/unclutter_1.09.bb index a7cc8ea..a336bea 100644 --- a/recipes-graphics/unclutter/unclutter_1.09.bb +++ b/recipes-graphics/unclutter/unclutter_1.09.bb @@ -4,9 +4,9 @@ LICENSE = "PublicDomain" DEPENDS = "virtual/xserver" PR = "r0" -S = "${WORKDIR}/${PN}-${PV}" +S = "${WORKDIR}/unclutter-${PV}" -SRC_URI = "${SOURCEFORGE_MIRROR}/unclutter/${PN}-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/unclutter/unclutter-${PV}.tar.gz \ file://cross-compile.patch \ " LIC_FILES_CHKSUM = "file://README;md5=7c9b6681ac4b35194de7d5f3585702b6" diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 39297a0..a3f31fd 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -8,7 +8,7 @@ DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/${PN}-${PV}_unixsrc.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-${PV}_unixsrc.tar.bz2 \ file://Makefile \ file://Vncviewer" diff --git a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend index 4fabae9..04faf30 100644 --- a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/xinput-calibrator:" # menu entry should make the calibration permanent instead of printing cal data into a terminal do_install_append() { diff --git a/recipes-lxde/lxde-common/lxde-common_%.bbappend b/recipes-lxde/lxde-common/lxde-common_%.bbappend index 16ef21c..7993b72 100644 --- a/recipes-lxde/lxde-common/lxde-common_%.bbappend +++ b/recipes-lxde/lxde-common/lxde-common_%.bbappend @@ -3,7 +3,7 @@ WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png" WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png" WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/lxde-common:" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-lxde/lxdm/lxdm_git.bbappend b/recipes-lxde/lxdm/lxdm_git.bbappend index ed7e7ee..7b868dd 100644 --- a/recipes-lxde/lxdm/lxdm_git.bbappend +++ b/recipes-lxde/lxdm/lxdm_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/lxdm:" SRC_URI += " \ file://logout-fixes.patch \ diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bbappend b/recipes-mozilla/firefox/firefox_10.0.11esr.bbappend index a44f652..ce23a9b 100644 --- a/recipes-mozilla/firefox/firefox_10.0.11esr.bbappend +++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bbappend @@ -11,7 +11,6 @@ SRC_URI += "file://alignment.patch \ " do_install_append() { - install -d ${D}${libdir}/${PN}/distribution - install -m 0644 ${WORKDIR}/distribution.ini ${D}${libdir}/${PN}/distribution/ + install -d ${D}${libdir}/firefox/distribution + install -m 0644 ${WORKDIR}/distribution.ini ${D}${libdir}/firefox/distribution/ } - diff --git a/recipes-multimedia/codecgraph/codecgraph_20120114.bb b/recipes-multimedia/codecgraph/codecgraph_20120114.bb index 5e70ad2..7640d35 100644 --- a/recipes-multimedia/codecgraph/codecgraph_20120114.bb +++ b/recipes-multimedia/codecgraph/codecgraph_20120114.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://helllabs.org/codecgraph/" LICENSE ="GPLv2+" RDEPENDS_${PN} = "python graphviz" -SRC_URI = "http://helllabs.org/codecgraph/${PN}-${PV}.tar.gz" +SRC_URI = "http://helllabs.org/codecgraph/codecgraph-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" SRC_URI[md5sum] = "30bb1afeda28b7e9b7f36e3b5b98a869" SRC_URI[sha256sum] = "24dca78c6a8cf894385df304d29f348d48868000d5ffbd03bf12c5b4f9805106" -S = "${WORKDIR}/${PN}-${PV}" +S = "${WORKDIR}/codecgraph-${PV}" PR = "r1" diff --git a/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend b/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend index 790a48e..2417cdb 100644 --- a/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend +++ b/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend @@ -3,6 +3,6 @@ EXTRA_OECONF += "--disable-sdl" do_install_append () { # make an empty file, so that ${PN} packages has not size 0 and does get created mkdir -p ${D}${datadir}/gstreamer-${LIBV} - touch ${D}${datadir}/gstreamer-${LIBV}/${PN} + touch ${D}${datadir}/gstreamer-${LIBV}/gst-plugins-bad } diff --git a/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bbappend b/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bbappend index 2c0c86f..b33b7d1 100644 --- a/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bbappend +++ b/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bbappend @@ -1,6 +1,6 @@ do_install_append () { # make an empty file, so that ${PN} packages has not size 0 and does get created mkdir -p ${D}${datadir}/gstreamer-${LIBV} - touch ${D}${datadir}/gstreamer-${LIBV}/${PN} + touch ${D}${datadir}/gstreamer-${LIBV}/gst-plugins-ugly } diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index a4ff624..e07cb46 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:" do_install_append () { #trdx specific -- cgit v1.2.3