From 1c2139f99dfb3918af446484c54a0c5e3010390c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 10 Jan 2015 14:52:58 +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-art/lxde-icon-theme/lxde-icon-theme_0.5.1.bb | 2 +- recipes-graphics/imlib2/imlib2_1.4.4.bb | 4 ++-- .../lxappearance-obconf/lxappearance-obconf_0.2.2.bb | 2 +- recipes-lxde/lxde-common/lxde-common_0.99.0.bb | 2 +- recipes-lxde/lxlauncher/lxlauncher_0.2.4.bb | 2 +- recipes-lxde/lxmenu-data/lxmenu-data_0.1.4.bb | 2 +- recipes-lxde/lxpanel/keybinder_0.3.0.bb | 2 +- recipes-lxde/lxpanel/lxpanel_0.8.0.bb | 2 +- recipes-lxde/lxrandr/lxrandr_0.3.0.bb | 2 +- recipes-lxde/lxsession/lxsession_0.5.2.bb | 2 +- recipes-lxde/lxtask/lxtask_0.1.6.bb | 2 +- recipes-lxde/lxterminal/lxterminal_0.2.0.bb | 2 +- recipes-lxde/menu-cache/menu-cache_1.0.0.bb | 2 +- recipes-lxde/obconf/obconf_2.0.3+git.bb | 2 +- recipes-lxde/openbox/openbox_3.5.0.bb | 12 ++++++------ 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/recipes-art/lxde-icon-theme/lxde-icon-theme_0.5.1.bb b/recipes-art/lxde-icon-theme/lxde-icon-theme_0.5.1.bb index a31a7c4..caacf93 100644 --- a/recipes-art/lxde-icon-theme/lxde-icon-theme_0.5.1.bb +++ b/recipes-art/lxde-icon-theme/lxde-icon-theme_0.5.1.bb @@ -5,7 +5,7 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxde-icon-theme-${PV}.tar.xz" SRC_URI[md5sum] = "7467133275edbbcc79349379235d4411" SRC_URI[sha256sum] = "e3d0b7399f28a360a3755171c9a08147d68f853f518be5485f5064675037916c" diff --git a/recipes-graphics/imlib2/imlib2_1.4.4.bb b/recipes-graphics/imlib2/imlib2_1.4.4.bb index 22ebfff..a86491e 100644 --- a/recipes-graphics/imlib2/imlib2_1.4.4.bb +++ b/recipes-graphics/imlib2/imlib2_1.4.4.bb @@ -36,7 +36,7 @@ do_install_append() { } PACKAGES =+ "\ - ${PN}-loaders-dbg \ + ${PN}-loaders-dbg \ ${PN}-filters-dbg \ ${PN}-loaders-dev \ ${PN}-filters-dev \ @@ -48,7 +48,7 @@ PACKAGES =+ "\ FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-tools = "${bindir} ${datadir}/${PN}" +FILES_${PN}-tools = "${bindir} ${datadir}/imlib2" FILES_${PN}-loaders = "${libdir}/imlib2/loaders/*.so" FILES_${PN}-filters = "${libdir}/imlib2/filters/*.so" FILES_${PN}-tools-dbg += "${bindir}/.debug" diff --git a/recipes-lxde/lxappearance-obconf/lxappearance-obconf_0.2.2.bb b/recipes-lxde/lxappearance-obconf/lxappearance-obconf_0.2.2.bb index 4412900..d28cd16 100644 --- a/recipes-lxde/lxappearance-obconf/lxappearance-obconf_0.2.2.bb +++ b/recipes-lxde/lxappearance-obconf/lxappearance-obconf_0.2.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "menu-cache lxappearance" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxappearance-obconf-${PV}.tar.xz" SRC_URI[md5sum] = "d958ac5514ba1707429ff6794ab59abf" SRC_URI[sha256sum] = "596a04078529b8ef594253bc8628feae97629f2e04f10e3ded5b84ff5706380b" diff --git a/recipes-lxde/lxde-common/lxde-common_0.99.0.bb b/recipes-lxde/lxde-common/lxde-common_0.99.0.bb index 050f9bf..c410232 100644 --- a/recipes-lxde/lxde-common/lxde-common_0.99.0.bb +++ b/recipes-lxde/lxde-common/lxde-common_0.99.0.bb @@ -10,7 +10,7 @@ PR = "r1" RDEPENDS_{PN} = "lxde-icon-theme" DEPENDS = "gtk+ lxde-icon-theme intltool-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxde-common-${PV}.tar.xz" SRC_URI[md5sum] = "5a417f5a0e5b510a0c018b66b0dc4081" SRC_URI[sha256sum] = "43f17bf92e4695fdf2476c1964990d1d61c832726dd0778ae4cb462b9d29335c" diff --git a/recipes-lxde/lxlauncher/lxlauncher_0.2.4.bb b/recipes-lxde/lxlauncher/lxlauncher_0.2.4.bb index 8a51e3e..59f00ab 100644 --- a/recipes-lxde/lxlauncher/lxlauncher_0.2.4.bb +++ b/recipes-lxde/lxlauncher/lxlauncher_0.2.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "menu-cache gtk+ intltool-native startup-notification" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxlauncher-${PV}.tar.xz" SRC_URI[md5sum] = "8a21590c085ad82f4f50e4affb7ad0ab" SRC_URI[sha256sum] = "01b7408a6d6f42769e94a54028f56dc8e724c2271d6bc01712b728569c1b9103" diff --git a/recipes-lxde/lxmenu-data/lxmenu-data_0.1.4.bb b/recipes-lxde/lxmenu-data/lxmenu-data_0.1.4.bb index 6c37444..0405eea 100644 --- a/recipes-lxde/lxmenu-data/lxmenu-data_0.1.4.bb +++ b/recipes-lxde/lxmenu-data/lxmenu-data_0.1.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" DEPENDS = "intltool-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxmenu-data-${PV}.tar.xz \ file://lxmenu-replace_am_glib_gnu_gettext.patch \ " diff --git a/recipes-lxde/lxpanel/keybinder_0.3.0.bb b/recipes-lxde/lxpanel/keybinder_0.3.0.bb index 86d4500..4e39d9b 100644 --- a/recipes-lxde/lxpanel/keybinder_0.3.0.bb +++ b/recipes-lxde/lxpanel/keybinder_0.3.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://libkeybinder/bind.c;md5=2d2071c3f1c7563111ad40b6be7b0 DEPENDS = "gtk+" -SRC_URI = "http://gentoo.inode.at/distfiles/${PN}-${PV}.tar.gz" +SRC_URI = "http://gentoo.inode.at/distfiles/keybinder-${PV}.tar.gz" SRC_URI[md5sum] = "2a0aed62ba14d1bf5c79707e20cb4059" SRC_URI[sha256sum] = "42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb" diff --git a/recipes-lxde/lxpanel/lxpanel_0.8.0.bb b/recipes-lxde/lxpanel/lxpanel_0.8.0.bb index 53884ac..cfec161 100644 --- a/recipes-lxde/lxpanel/lxpanel_0.8.0.bb +++ b/recipes-lxde/lxpanel/lxpanel_0.8.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183" DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools pcmanfm libxml2 keybinder" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxpanel-${PV}.tar.xz \ file://lxpanel-broken-apps.patch \ " SRC_URI[md5sum] = "aa5bc73f4fe1d8006248a1f45f0a8a21" diff --git a/recipes-lxde/lxrandr/lxrandr_0.3.0.bb b/recipes-lxde/lxrandr/lxrandr_0.3.0.bb index 863500d..2246247 100644 --- a/recipes-lxde/lxrandr/lxrandr_0.3.0.bb +++ b/recipes-lxde/lxrandr/lxrandr_0.3.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "virtual/libintl intltool-native xrandr gtk+" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxrandr-${PV}.tar.xz" SRC_URI[md5sum] = "250f0ebb09c1e02f430f951911ba1259" SRC_URI[sha256sum] = "183deaed658c4a0ba937fc349e88330267b8309fc51f67f7ec4b4768ccc66b76" diff --git a/recipes-lxde/lxsession/lxsession_0.5.2.bb b/recipes-lxde/lxsession/lxsession_0.5.2.bb index a3007d9..0067b46 100644 --- a/recipes-lxde/lxsession/lxsession_0.5.2.bb +++ b/recipes-lxde/lxsession/lxsession_0.5.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a76102f7f48780284bee49e6edaeb5a9" DEPENDS = "gtk+ glib-2.0 lxde-common dbus libgee xproto virtual/libx11 polkit dbus-glib" RDEPENDS_{PN} = "upower dbus-x11" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxsession-${PV}.tar.xz" SRC_URI[md5sum] = "2957acccbf9ce37ef8205ec5424f8047" SRC_URI[sha256sum] = "2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada" diff --git a/recipes-lxde/lxtask/lxtask_0.1.6.bb b/recipes-lxde/lxtask/lxtask_0.1.6.bb index 3456812..e8f7be3 100644 --- a/recipes-lxde/lxtask/lxtask_0.1.6.bb +++ b/recipes-lxde/lxtask/lxtask_0.1.6.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "virtual/libintl intltool-native gtk+ glib-2.0" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxtask-${PV}.tar.xz" SRC_URI[md5sum] = "14b5341822aaa049f2d4d5a56c1b28f2" SRC_URI[sha256sum] = "f78d6a9953dfbedfa00f69b3e908e326398cd40f541bc8a6a08f5f0a06894345" diff --git a/recipes-lxde/lxterminal/lxterminal_0.2.0.bb b/recipes-lxde/lxterminal/lxterminal_0.2.0.bb index d2dd74a..ac9eefc 100644 --- a/recipes-lxde/lxterminal/lxterminal_0.2.0.bb +++ b/recipes-lxde/lxterminal/lxterminal_0.2.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" RDEPENDS_{PN} = "gtk+ libvte glib-2.0" DEPENDS = "gtk+ vte glib-2.0 intltool-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/lxterminal-${PV}.tar.gz" SRC_URI[md5sum] = "e80ad1b6e26212f3d43908c2ad87ba4d" SRC_URI[sha256sum] = "174b0e99652f72acd7a98b6ff1b75eba1a9bf364996e6f118cccdaba0d282baf" diff --git a/recipes-lxde/menu-cache/menu-cache_1.0.0.bb b/recipes-lxde/menu-cache/menu-cache_1.0.0.bb index b0d5205..ab909f7 100644 --- a/recipes-lxde/menu-cache/menu-cache_1.0.0.bb +++ b/recipes-lxde/menu-cache/menu-cache_1.0.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" SECTION = "x11/libs" DEPENDS = "glib-2.0 intltool-native libfm-extra" -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad" SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf" diff --git a/recipes-lxde/obconf/obconf_2.0.3+git.bb b/recipes-lxde/obconf/obconf_2.0.3+git.bb index eb44c4f..1e1d84d 100644 --- a/recipes-lxde/obconf/obconf_2.0.3+git.bb +++ b/recipes-lxde/obconf/obconf_2.0.3+git.bb @@ -29,7 +29,7 @@ do_configure_prepend () { } do_configure_append () { - sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${S}/${PN}.desktop || bbfatal "sed failed" + sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${S}/obconf.desktop || bbfatal "sed failed" } do_install_append () { diff --git a/recipes-lxde/openbox/openbox_3.5.0.bb b/recipes-lxde/openbox/openbox_3.5.0.bb index 91e5227..cb718e6 100644 --- a/recipes-lxde/openbox/openbox_3.5.0.bb +++ b/recipes-lxde/openbox/openbox_3.5.0.bb @@ -29,23 +29,23 @@ ALTERNATIVE_PRIORITY[x-window-manager] = "10" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dbg ${PN}-kde ${PN}-kde-dbg" FILES_${PN} += "${datadir}/gnome ${datadir}/xsessions" FILES_${PN}-gnome = "\ - ${bindir}/${PN}-gnome-session \ + ${bindir}/openbox-gnome-session \ ${bindir}/gnome-panel-control \ ${bindir}/gdm-control \ - ${datadir}/xsessions/${PN}-gnome.desktop \ + ${datadir}/xsessions/openbox-gnome.desktop \ ${datadir}/gnome \ " FILES_${PN}-gnome-dbg = "\ - ${bindir}/.debug/${PN}-gnome-session \ + ${bindir}/.debug/openbox-gnome-session \ ${bindir}/.debug/gnome-panel-control \ ${bindir}/.debug/gdm-control \ " FILES_${PN}-kde = "\ - ${bindir}/${PN}-kde-session \ - ${datadir}/xsessions/${PN}-kde.desktop \ + ${bindir}/openbox-kde-session \ + ${datadir}/xsessions/openbox-kde.desktop \ " FILES_${PN}-kde-dbg = "\ - ${bindir}/.debug/${PN}-kde-session \ + ${bindir}/.debug/openbox-kde-session \ " PACKAGES_DYNAMIC += "${PN}-theme-*" -- cgit v1.2.3