From 994595da741d7298145c20da016625982d5d7c5b Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 5 Mar 2013 16:17:14 +0100 Subject: [PATCH] meta-digi-del: Remove del override. We want customers that use meta-digi-del to be able to define their own distros without breaking our recipes. Signed-off-by: Alex Gonzalez --- .../bluez/bluez4_4.101.bbappend | 2 +- .../initscripts/initscripts_1.0.bbappend | 2 +- .../sysvinit/sysvinit_2.88dsf.bbappend | 4 +-- .../gst-fsl-plugin_2.0.3.bbappend | 32 +++++++++---------- .../gst-plugins-good_0.10.31.bbappend | 4 +-- .../libdvdread/libdvdread_4.1.3-10.bbappend | 8 ++--- .../mplayer/mplayer2_git.bbappend | 14 ++++---- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend index fd3c1e337..f57bd6ec2 100644 --- a/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend +++ b/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend @@ -5,7 +5,7 @@ PR_append = "+${DISTRO}.r0" # gobject-introspection SRC_URI += "file://simple-agent" -EXTRA_OECONF_append_del = " --enable-health" +EXTRA_OECONF_append = " --enable-health" do_install_append() { install -m 0755 ${WORKDIR}/simple-agent ${D}${bindir} diff --git a/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend index db34bad84..332a21f91 100644 --- a/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,3 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -PR_append_del = "+${DISTRO}.r0" +PR_append = "+${DISTRO}.r0" diff --git a/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend index dbd14a43d..3188fd9d4 100644 --- a/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend +++ b/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend @@ -1,8 +1,8 @@ -PR_append_del = "+${DISTRO}.r0" +PR_append = "+${DISTRO}.r0" # Remove 'bootlogd' bootscript and symlinks # (synchronize with poky's sysvinit_2.88dsf.bb) -do_install_append_del() { +do_install_append() { rm -f ${D}${sysconfdir}/init.d/stop-bootlogd rm -f ${D}${sysconfdir}/init.d/bootlogd rm -f ${D}${sysconfdir}/rc2.d/S99stop-bootlogd diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend index b0d726069..4c67ff858 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend @@ -1,16 +1,16 @@ -FILESEXTRAPATHS_prepend_del := "${THISDIR}/files:" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0001-ltmain.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch" -SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch" -PR_append_del = "+${DISTRO}.0" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0001-ltmain.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch" +SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch" +PR_append = "+${DISTRO}.0" diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend index ac762584c..1ea90399f 100644 --- a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend @@ -3,9 +3,9 @@ PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvid PACKAGECONFIG[flac] = ",--disable-flac," DEPENDS_no_X := "${@oe_filter_out('gconf', '${DEPENDS}', d)}" -DEPENDS_del := "${@base_contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_no_X}', d)}" +DEPENDS := "${@base_contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_no_X}', d)}" -EXTRA_OECONF_del += "\ +EXTRA_OECONF += "\ --disable-aalibtest \ --disable-audiofx \ --disable-cairo \ diff --git a/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend b/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend index 72e4d1f4d..5ca72e610 100644 --- a/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend +++ b/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend @@ -1,8 +1,8 @@ # Copyright (C) 2012 Digi International. -PR_append_del = "+${DISTRO}.0" +PR_append = "+${DISTRO}.0" -LIC_FILES_CHKSUM_del = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" -SRC_URI_del = "git://sources.progress-linux.org/git/users/daniel/packages/${PN}.git;protocol=git;branch=debian" +LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" +SRC_URI = "git://sources.progress-linux.org/git/users/daniel/packages/${PN}.git;protocol=git;branch=debian" -SRCREV_del = "debian/4.2.0-1" +SRCREV = "debian/4.2.0-1" diff --git a/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend b/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend index 49bf6047e..5dabf30b2 100644 --- a/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend +++ b/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2012 Digi International. -PR_append_del = "+${DISTRO}.0" +PR_append = "+${DISTRO}.0" # live555 does not currently compile, this allows to remove it as a dependency. VIRTUAL-RUNTIME_streaming_framework = "" @@ -10,17 +10,17 @@ VIRTUAL-RUNTIME_streaming_framework = "" VIRTUAL-RUNTIME_fonts_management = "" #VIRTUAL-RUNTIME_fonts_management = "fontconfig" -DEPENDS_del = "libdvdread libtheora ffmpeg zlib libpng jpeg liba52 freetype alsa-lib lzo ncurses lame libass \ +DEPENDS = "libdvdread libtheora ffmpeg zlib libpng jpeg liba52 freetype alsa-lib lzo ncurses lame libass \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" -DEPENDS_del += "${VIRTUAL-RUNTIME_streaming_framework}" -DEPENDS_del += "${VIRTUAL-RUNTIME_fonts_management}" -DEPENDS_del += "${@base_contains('DISTRO_FEATURES', 'x11', 'libvpx virtual/libsdl xsp libxv virtual/libx11', '', d)}" +DEPENDS += "${VIRTUAL-RUNTIME_streaming_framework}" +DEPENDS += "${VIRTUAL-RUNTIME_fonts_management}" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libvpx virtual/libsdl xsp libxv virtual/libx11', '', d)}" EXTRA_LIBS = " -lstdc++ -lvorbis" EXTRA_LIBS += "${@base_contains('DISTRO_FEATURES', 'x11', ' -lXext -lX11', '', d)}" EXTRA_LIBS += "${@base_conditional('VIRTUAL-RUNTIME_streaming_framework', 'live555', ' -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia', '', d)}" -EXTRA_OECONF_del = " \ +EXTRA_OECONF = " \ --prefix=/usr \ --mandir=${mandir} \ --target=${SIMPLE_TARGET_SYS} \ @@ -112,7 +112,7 @@ EXTRA_OECONF_del = " \ --extra-libs='${EXTRA_LIBS}' \ " -EXTRA_OECONF_del += " \ +EXTRA_OECONF += " \ ${@base_conditional('VIRTUAL-RUNTIME_fonts_management', 'fontconfig', '', '--disable-fontconfig', d)} \ ${@base_conditional('VIRTUAL-RUNTIME_streaming_framework', 'live555', '', '--disable-live', d)} \ "