[dvbapp] move PN/PR location to avoid merge conflict.
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2.bb
index da9a59b..2192246 100644 (file)
@@ -88,15 +88,14 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r72"
+PR = "r79"
 
 inherit gitpkgv pythonnative
 
-PKGV = "git${GITPKGV}"
-
 ####################################################
+PV = "experimental-gitr${SRCPV}"
+PKGV = "experimental-gitr${GITPKGV}"
 BRANCH = "vuplus_experimental"
-PV = "experimental-git${SRCPV}"
 SRCREV = ""
 ####################################################
 
@@ -124,7 +123,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
        file://number_key \
 "
 
-SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
+SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", d)}"
 
 def change_po():
     import os