Remove package error, [libbluray, libshairport] is listed in PACKAGES multiple times...

diff --git a/meta-openvuplus/recipes-support/libbluray/libbluray.inc b/meta-openvuplus/recipes-support/libbluray/libbluray.inc
index ff83a53..beb8186 100644 (file)
--- a/meta-openvuplus/recipes-support/libbluray/libbluray.inc
+++ b/meta-openvuplus/recipes-support/libbluray/libbluray.inc
@@ -3,14 +3,10 @@ SECTION = "misc"
 HOMEPAGE = "http://videolan.org"
 DEPENDS = ""
 LICENSE = "GPLv2"
 HOMEPAGE = "http://videolan.org"
 DEPENDS = ""
 LICENSE = "GPLv2"

-INC_PR = "r4"
+INC_PR = "r5"

 S="${WORKDIR}/git"
 SRC_URI = "git://git.videolan.org/libbluray.git;branch=master;protocol=git \
                "
 S="${WORKDIR}/git"
 SRC_URI = "git://git.videolan.org/libbluray.git;branch=master;protocol=git \
                "

-

 inherit autotools
 
 inherit autotools
 

-
-PACKAGES += "${PN}"
-

 FILES_${PN} = "/"
 FILES_${PN} = "/"

diff --git a/meta-openvuplus/recipes-support/libbluray/libbluray_1.0.0.bb b/meta-openvuplus/recipes-support/libbluray/libbluray_1.0.0.bb
index 656a2bb..34f2d39 100644 (file)
--- a/meta-openvuplus/recipes-support/libbluray/libbluray_1.0.0.bb
+++ b/meta-openvuplus/recipes-support/libbluray/libbluray_1.0.0.bb
@@ -5,7 +5,7 @@ RDEPENDS += "libaacs libdca libdvdcss"
 
 SRCREV="491c7e8501d7e7ea853700a2f35a18f11ad40a5b"
 LIC_FILES_CHKSUM="file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
 
 SRCREV="491c7e8501d7e7ea853700a2f35a18f11ad40a5b"
 LIC_FILES_CHKSUM="file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"

-PR = "r2"
+PR = "${INC_PR}.2"

 
 #SRC_URI[archive.md5sum] = "b009e0550c3cf54d740e92a5f47821e1"
 #SRC_URI[archive.sha256sum] = "61602402d846a50e8ddf82c3fb5b81984de95ed56abfe0f1e22426d1901c564f"
 
 #SRC_URI[archive.md5sum] = "b009e0550c3cf54d740e92a5f47821e1"
 #SRC_URI[archive.sha256sum] = "61602402d846a50e8ddf82c3fb5b81984de95ed56abfe0f1e22426d1901c564f"

diff --git a/meta-openvuplus/recipes-support/libshairport/libshairport.inc b/meta-openvuplus/recipes-support/libshairport/libshairport.inc
index 70fff54..e7083cb 100644 (file)
--- a/meta-openvuplus/recipes-support/libshairport/libshairport.inc
+++ b/meta-openvuplus/recipes-support/libshairport/libshairport.inc
@@ -3,7 +3,7 @@ SECTION = "misc"
 HOMEPAGE = "http://xbmc.org/"
 DEPENDS = "openssl"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://xbmc.org/"
 DEPENDS = "openssl"
 LICENSE = "GPLv2"

-INC_PR = "r4"
+INC_PR = "r5"

 S="${WORKDIR}/${PN}-${PV}_lib"
 SRC_URI = "http://mirrors.xbmc.org/build-deps/darwin-libs/${PN}-${PV}_lib.tar.gz;name=archive \
            file://001_add_ao.patch;apply=yes;striplevel=0 \
 S="${WORKDIR}/${PN}-${PV}_lib"
 SRC_URI = "http://mirrors.xbmc.org/build-deps/darwin-libs/${PN}-${PV}_lib.tar.gz;name=archive \
            file://001_add_ao.patch;apply=yes;striplevel=0 \


@@ -38,6 +38,4 @@ inherit autotools package
 do_package_qa() {
 }
 
 do_package_qa() {
 }
 

-PACKAGES += "${PN}"
-

 FILES_${PN} = "/"
 FILES_${PN} = "/"

diff --git a/meta-openvuplus/recipes-support/libshairport/libshairport_1.2.0.20310.bb b/meta-openvuplus/recipes-support/libshairport/libshairport_1.2.0.20310.bb
index 0d046c4..f8fda8e 100644 (file)
--- a/meta-openvuplus/recipes-support/libshairport/libshairport_1.2.0.20310.bb
+++ b/meta-openvuplus/recipes-support/libshairport/libshairport_1.2.0.20310.bb
@@ -2,7 +2,7 @@ require libshairport.inc
 
 DEPENDS += ""
 LIC_FILES_CHKSUM="file://COPYING;md5=d41d8cd98f00b204e9800998ecf8427e"
 
 DEPENDS += ""
 LIC_FILES_CHKSUM="file://COPYING;md5=d41d8cd98f00b204e9800998ecf8427e"

-PR = "r1"
+PR = "${INC_PR}.1"

 
 SRC_URI[archive.md5sum] = "b009e0550c3cf54d740e92a5f47821e1"
 SRC_URI[archive.sha256sum] = "61602402d846a50e8ddf82c3fb5b81984de95ed56abfe0f1e22426d1901c564f"
 
 SRC_URI[archive.md5sum] = "b009e0550c3cf54d740e92a5f47821e1"
 SRC_URI[archive.sha256sum] = "61602402d846a50e8ddf82c3fb5b81984de95ed56abfe0f1e22426d1901c564f"