From 9b370d5a7922ada07fef5d5489d15200cd039cac Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Mar 2014 18:39:52 +0100 Subject: [PATCH] meta-digi: remove PRINC from recipes and use a local PR server This cleans following warning: Use of PRINC is deprecated. The PR server should be used to automatically increment the PR. See: https://wiki.yoctoproject.org/wiki/PR_Service Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend | 3 --- meta-digi-arm/recipes-core/udev/udev-extraconf_1.0.bbappend | 3 --- .../recipes-connectivity/bluez/bluez4_4.101.bbappend | 3 --- .../recipes-connectivity/cherokee/cherokee_1.2.98.bbappend | 3 --- .../recipes-connectivity/vsftpd/vsftpd_3.0.0.bbappend | 3 --- .../recipes-core/base-files/base-files_3.0.14.bbappend | 3 --- meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend | 3 --- .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 --- .../recipes-core/initscripts/initscripts_1.0.bbappend | 3 --- meta-digi-dey/recipes-core/psplash/psplash_git.bbappend | 3 --- .../recipes-core/sysvinit/sysvinit_2.88dsf.bbappend | 3 --- .../xinput-calibrator/pointercal-xinput_0.0.bbappend | 3 --- .../gst-plugins/gst-plugins-base_0.10.36.bbappend | 3 --- .../recipes-multimedia/mplayer/mplayer2_git.bbappend | 3 --- sdk/config/ccardimx28js/local.conf.sample | 5 +++++ sdk/config/ccimx51js/local.conf.sample | 5 +++++ sdk/config/ccimx53js/local.conf.sample | 5 +++++ sdk/config/ccimx6adpt/local.conf.sample | 5 +++++ 18 files changed, 20 insertions(+), 42 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend index 358ffa3e7..0b9f548b4 100644 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:" SRC_URI += " \ diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.0.bbappend b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.0.bbappend index 034068d77..2ece1ca28 100644 --- a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.0.bbappend +++ b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.0.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://mount_bootparts.sh" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez4_4.101.bbappend index ec6318ba1..e5b717059 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez4_4.101.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez4_4.101.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" # Use 'simple-agent' from bluez-4.98 to avoid a dependence in diff --git a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend index b7b986b21..f96e486c2 100644 --- a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +++ b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" MIRRORS =+ " \ diff --git a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_3.0.0.bbappend b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_3.0.0.bbappend index 59175e2be..8fe5e3bb0 100644 --- a/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_3.0.0.bbappend +++ b/meta-digi-dey/recipes-connectivity/vsftpd/vsftpd_3.0.0.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" INSANE_SKIP_${PN} = "installed-vs-shipped" diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend index 7032000a0..298522b0c 100644 --- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend index 8ec2de7c8..ffa748c8e 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += "libdigi" diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 624b3ab1c..80e0d339a 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" SRC_URI_append_mx5 = " file://ifup" diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend index 0fedfbc0f..47d691f81 100644 --- a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - # The initscripts package includes a '/etc/init.d/umountfs' script used for # reboot/poweroff purposes. That script calls the 'umount' command but seems # that the combination of busybox' umount + linux 3.x fails in this script (it diff --git a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend index 74b11e8dc..96121cd92 100644 --- a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend +++ b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - # Override default bootscript settings from Poky # # On an embedded target using the serial terminal as console, the diff --git a/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend index 29a678546..0e7e72490 100644 --- a/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend +++ b/meta-digi-dey/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - # Remove 'bootlogd' bootscript and symlinks # (synchronize with poky's sysvinit_2.88dsf.bb) do_install_append() { diff --git a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend index c3d73f6b7..57db9762f 100644 --- a/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend +++ b/meta-digi-dey/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend @@ -1,6 +1,3 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:" diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend index 10884bcb0..301174c1a 100644 --- a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend +++ b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2013 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - # Disable integer vorbis plugin as it conflicts with other vorbis plugin with # error: GLib-GObject-WARNING **: cannot register existing type `GstVorbisDec' EXTRA_OECONF += "--disable-ivorbis" diff --git a/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend b/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend index 7dd660827..3aa7d7ba6 100644 --- a/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend +++ b/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend @@ -1,8 +1,5 @@ # Copyright (C) 2012 Digi International. -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - # live555 does not currently compile, this allows to remove it as a dependency. VIRTUAL-RUNTIME_streaming_framework = "" #VIRTUAL-RUNTIME_streaming_framework = "live555" diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample index a7adde741..26f53b93d 100644 --- a/sdk/config/ccardimx28js/local.conf.sample +++ b/sdk/config/ccardimx28js/local.conf.sample @@ -258,3 +258,8 @@ ASSUME_PROVIDED += "libsdl-native" # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "1" + +# +# Enable local PR server +# +PRSERV_HOST = "localhost:0" diff --git a/sdk/config/ccimx51js/local.conf.sample b/sdk/config/ccimx51js/local.conf.sample index 62c0f7139..a38a2580f 100644 --- a/sdk/config/ccimx51js/local.conf.sample +++ b/sdk/config/ccimx51js/local.conf.sample @@ -258,3 +258,8 @@ ASSUME_PROVIDED += "libsdl-native" # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "1" + +# +# Enable local PR server +# +PRSERV_HOST = "localhost:0" diff --git a/sdk/config/ccimx53js/local.conf.sample b/sdk/config/ccimx53js/local.conf.sample index dd93a492f..b931f9810 100644 --- a/sdk/config/ccimx53js/local.conf.sample +++ b/sdk/config/ccimx53js/local.conf.sample @@ -258,3 +258,8 @@ ASSUME_PROVIDED += "libsdl-native" # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "1" + +# +# Enable local PR server +# +PRSERV_HOST = "localhost:0" diff --git a/sdk/config/ccimx6adpt/local.conf.sample b/sdk/config/ccimx6adpt/local.conf.sample index b9a2a188d..fc6245de7 100644 --- a/sdk/config/ccimx6adpt/local.conf.sample +++ b/sdk/config/ccimx6adpt/local.conf.sample @@ -258,3 +258,8 @@ ASSUME_PROVIDED += "libsdl-native" # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "1" + +# +# Enable local PR server +# +PRSERV_HOST = "localhost:0"