Skip to contentSkip to conversation

Removals of recipes/classes now in OE-Core

PATCH In review Paul Eggleton 2 participants 8 messages Aug 28, 2013 – Sep 3, 2013

lore
Share & tools
lore
#0 lore raw

cover Removals of recipes/classes now in OE-Core

The following changes since commit 72e23c12296fbc77193898c38426add58d0c2d71:

mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/oecore-moves2
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/oecore-moves2

Paul Eggleton (6):
midori: remove
vala: remove
classes/vala: remove
python-docutils: remove
libnotify: remove
ca-certificates: remove

 .../recipes-connectivity/midori/midori_0.5.2.bb    | 42 ----------------
 .../recipes-gnome/libnotify/libnotify_0.6.0.bb     | 17 -------
 meta-oe/classes/vala.bbclass                       | 18 -------
 .../recipes-devtools/python/python-docutils_0.5.bb | 19 --------
 ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 --------------------
 meta-oe/recipes-devtools/vala/vala.inc             | 20 --------
 meta-oe/recipes-devtools/vala/vala_0.16.0.bb       |  8 ----
 .../ca-certificates/ca-certificates-20130119.inc   | 15 ------
 .../ca-certificates-cross_20130119.bb              | 12 -----
 ...01-update-ca-certificates-remove-c-rehash.patch | 45 -----------------
 .../0002-update-ca-certificates-use-SYSROOT.patch  | 56 ----------------------
 .../ca-certificates/ca-certificates_20130119.bb    | 30 ------------
 12 files changed, 335 deletions(-)
 delete mode 100644 meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
 delete mode 100644 meta-oe/classes/vala.bbclass
 delete mode 100644 meta-oe/recipes-devtools/python/python-docutils_0.5.bb
 delete mode 100644 meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta-oe/recipes-devtools/vala/vala.inc
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.16.0.bb
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/6 midori: remove

This is now in OE-Core as of 88d9d7e47dedd9bfa26da860e6ff77ee5206d9e8.

---
 .../recipes-connectivity/midori/midori_0.5.2.bb    | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb deleted +0 -42
deleted file mode 100644
index f4f6221..0000000
@@ -1,42 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique"
-
-SRC_URI = "http://archive.xfce.org/src/apps/midori/0.5/midori-${PV}.tar.bz2;name=midori \
-"
-SRC_URI[midori.md5sum] = "e2c1e0b617397ec9f9eef4fdb47b3565"
-SRC_URI[midori.sha256sum] = "a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c"
-
-inherit gtk-icon-cache pkgconfig vala pythonnative
-
-do_configure() {
-    sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript
-    ./configure \
-            --prefix=${prefix} \
-            --bindir=${bindir} \
-            --sbindir=${sbindir} \
-            --libexecdir=${libexecdir} \
-            --datadir=${datadir} \
-            --sysconfdir=${sysconfdir} \
-            --sharedstatedir=${sharedstatedir} \
-            --localstatedir=${localstatedir} \
-            --libdir=${libdir} \
-            --includedir=${includedir} \
-            --infodir=${infodir} \
-            --mandir=${mandir} \
-            --disable-gtk3 \
-            --disable-zeitgeist \
-}
-
-PARALLEL_MAKE = ""
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_install() {
-    oe_runmake DESTDIR=${D} install
-}
-
-RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
-
-FILES_${PN}-dev += "${datadir}/vala/vapi"
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/6 vala: remove

In reply to Paul Eggleton

This is now in OE-Core as of 649b48557d8702daaf4f28482848ab0b07abed83.

---
 ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 ----------------------
 meta-oe/recipes-devtools/vala/vala.inc             | 20 --------
 meta-oe/recipes-devtools/vala/vala_0.16.0.bb       |  8 ----
 3 files changed, 81 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta-oe/recipes-devtools/vala/vala.inc
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.16.0.bb
meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch deleted +0 -53
deleted file mode 100644
index e6c7941..0000000
@@ -1,53 +0,0 @@
-From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 21 Feb 2012 17:12:50 +0100
-Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
- repo
-
-* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- build-aux/git-version-gen |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 0fa6faa..1d1f9d2 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -126,18 +126,21 @@ fi
- 
- v=`echo "$v" |sed 's/^v//'`
- 
--# Don't declare a version "dirty" merely because a time stamp has changed.
--git status > /dev/null 2>&1
-+if test -d .git
-+then
-+	# Don't declare a version "dirty" merely because a time stamp has changed.
-+	git status > /dev/null 2>&1
- 
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
--case "$dirty" in
--    '') ;;
--    *) # Append the suffix only if there isn't one already.
--	case $v in
--	  *-dirty) ;;
--	  *) v="$v-dirty" ;;
--	esac ;;
--esac
-+	dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+	case "$dirty" in
-+	    '') ;;
-+	    *) # Append the suffix only if there isn't one already.
-+		case $v in
-+		  *-dirty) ;;
-+		  *) v="$v-dirty" ;;
-+		esac ;;
-+	esac
-+fi
- 
- # Omit the trailing newline, so that m4_esyscmd can use the result directly.
- echo "$v" | tr -d '\012'
--- 
-1.7.8.4
-
meta-oe/recipes-devtools/vala/vala.inc deleted +0 -20
deleted file mode 100644
index 6cdc605..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \
-Vala compiles to plain C and has no runtime environment nor penalities whatsoever."
-SECTION = "devel"
-DEPENDS = "glib-2.0 dbus gtk+"
-BBCLASSEXTEND = "native"
-DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
-HOMEPAGE = "http://vala-project.org"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-INC_PR = "r1"
-
-SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
-inherit autotools
-
-EXTRA_OECONF = "--disable-vapigen"
-
-FILES_${PN}-doc += "${datadir}/devhelp"
-FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi"
meta-oe/recipes-devtools/vala/vala_0.16.0.bb deleted +0 -8
deleted file mode 100644
index 92120b4..0000000
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
-
-SRC_URI[md5sum] = "84b742e9cca4c90fde3026c3793c03c1"
-SRC_URI[sha256sum] = "3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657"
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/6 classes/vala: remove

In reply to Paul Eggleton

This is now in OE-Core as of 807285c751862aaa775db5a13293007bfb3c29df.

---
 meta-oe/classes/vala.bbclass | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 meta-oe/classes/vala.bbclass
meta-oe/classes/vala.bbclass deleted +0 -18
deleted file mode 100644
index c7db08c..0000000
@@ -1,18 +0,0 @@
-# Vala has problems with multiple concurrent invocations
-PARALLEL_MAKE = ""
-
-# Vala needs vala-native
-DEPENDS += "vala-native"
-DEPENDS_virtclass-native += "vala-native"
-
-# Our patched version of Vala looks in STAGING_DATADIR for .vapi files
-export STAGING_DATADIR
-# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files
-export XDG_DATA_DIRS = "${STAGING_DATADIR}"
-
-# Package additional files
-FILES_${PN}-dev += "\
-    ${datadir}/vala/vapi/*.vapi \
-    ${datadir}/vala/vapi/*.deps \
-    ${datadir}/gir-1.0 \
-"
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH 4/6 python-docutils: remove

In reply to Paul Eggleton

This is now in OE-Core as of 1bc1ff887c29376bb0d05beee1bbc2cf25b08419.

---
 .../recipes-devtools/python/python-docutils_0.5.bb    | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/python/python-docutils_0.5.bb
meta-oe/recipes-devtools/python/python-docutils_0.5.bb deleted +0 -19
deleted file mode 100644
index e4c8a7d..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "Text processing system"
-HOMEPAGE = "http://docutils.sourceforge.net"
-SECTION = "devel/python"
-LICENSE = "PSF"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=ac6ee29ac0310c091afab5ac4bea2fa3"
-PR = "r2"
-
-DEPENDS = "python"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz"
-SRC_URI[md5sum] = "dd72dac92fc8e3eb0f48c3effeef80f6"
-SRC_URI[sha256sum] = "747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e"
-
-S = "${WORKDIR}/docutils-${PV}"
-
-inherit distutils
-
-BBCLASSEXTEND = "native"
-
Signature · 1 line
1.8.1.2
#5 lore raw

PATCH 5/6 libnotify: remove

In reply to Paul Eggleton

This is now in OE-Core as of f72c0ff46d6895978e7e5230cb882d8eee4005ba (libnotify3 remains).

---
 meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb deleted +0 -17
deleted file mode 100644
index 0a590e3..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "Send desktop notifications to a notification daemon"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-PR = "r1"
-
-DEPENDS = "dbus gtk+"
-
-inherit gnome
-SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
-SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
-
-do_configure_prepend() {
-    sed -i /GTK3/d configure.ac
-    sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am
-}
Signature · 1 line
1.8.1.2
#6 lore raw

PATCH 6/6 ca-certificates: remove

In reply to Paul Eggleton

This is now in OE-Core as of ad2851cf0abc2ab35e0f60c96d3142c29a07c8fc. ca-certificates-cross is no longer used (effectively replaced by a native BBCLASSEXTEND in the main recipe).

---
 .../ca-certificates/ca-certificates-20130119.inc   | 15 ------
 .../ca-certificates-cross_20130119.bb              | 12 -----
 ...01-update-ca-certificates-remove-c-rehash.patch | 45 -----------------
 .../0002-update-ca-certificates-use-SYSROOT.patch  | 56 ----------------------
 .../ca-certificates/ca-certificates_20130119.bb    | 30 ------------
 5 files changed, 158 deletions(-)
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc deleted +0 -15
deleted file mode 100644
index ac993bc..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "Common CA certificates"
-HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
-SECTION = "misc"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5"
-PR = "r1"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \
-           file://0001-update-ca-certificates-remove-c-rehash.patch \
-           file://0002-update-ca-certificates-use-SYSROOT.patch"
-
-SRC_URI[md5sum] = "1fbbec2028a33cf865b79c204aa2e626"
-SRC_URI[sha256sum] = "fb51ec9a2c551838cc1646a0b3c9e6bea5c1bb20ff5d71c542451fac4b191c22"
-
-inherit allarch
meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb deleted +0 -12
deleted file mode 100644
index 171d6a0..0000000
@@ -1,12 +0,0 @@
-require ca-certificates-${PV}.inc
-
-do_install() {
-    install -d ${D}${bindir_crossscripts}
-    install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts}
-}
-
-SYSROOT_PREPROCESS_FUNCS += "ca_certificates_sysroot_preprocess"
-
-ca_certificates_sysroot_preprocess() {
-    sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
-}
meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch deleted +0 -45

45 lines not on this page · raw message

meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch deleted +0 -56

56 lines not on this page · raw message

meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb deleted +0 -30
deleted file mode 100644
index 504190f..0000000
@@ -1,30 +0,0 @@
-DEPENDS = "ca-certificates-cross"
-
-require ca-certificates-${PV}.inc
-
-inherit autotools
-
-do_install_prepend() {
-    mkdir -p ${D}/usr/share/ca-certificates
-    mkdir -p ${D}/usr/sbin
-    mkdir -p ${D}/etc/ssl/certs
-    mkdir -p ${D}/etc/ca-certificates/update.d
-}
-
-do_install_append() {
-    cd ${D}/usr/share/ca-certificates
-    echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf
-    echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf
-    echo "#" >> ${D}/etc/ca-certificates.conf
-    for crt in $(find . -type f -name '*.crt' -print)
-    do
-        crt=$(echo $crt | sed -e 's/\.\///')
-        echo $crt >> ${D}/etc/ca-certificates.conf
-    done
-}
-
-pkg_postinst_${PN} () {
-SYSROOT="$D" update-ca-certificates
-}
-
-CONFFILES_${PN} = "/etc/ca-certificates.conf"
Signature · 1 line
1.8.1.2
#7 lore raw
In reply to Paul Eggleton
Quoted 3 lines · Paul Eggleton

The following changes since commit 72e23c12296fbc77193898c38426add58d0c2d71:

mysql5: replace with mariadb 5.1.67 and tweak (2013-08-27 16:39:31 +0100)

All applied, thanks!

Quoted 47 lines

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/oecore-moves2
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/oecore-moves2

Paul Eggleton (6):
midori: remove
vala: remove
classes/vala: remove
python-docutils: remove
libnotify: remove
ca-certificates: remove

 .../recipes-connectivity/midori/midori_0.5.2.bb    | 42 ----------------
 .../recipes-gnome/libnotify/libnotify_0.6.0.bb     | 17 -------
 meta-oe/classes/vala.bbclass                       | 18 -------
 .../recipes-devtools/python/python-docutils_0.5.bb | 19 --------
 ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 --------------------
 meta-oe/recipes-devtools/vala/vala.inc             | 20 --------
 meta-oe/recipes-devtools/vala/vala_0.16.0.bb       |  8 ----
 .../ca-certificates/ca-certificates-20130119.inc   | 15 ------
 .../ca-certificates-cross_20130119.bb              | 12 -----
 ...01-update-ca-certificates-remove-c-rehash.patch | 45 -----------------
 .../0002-update-ca-certificates-use-SYSROOT.patch  | 56 ----------------------
 .../ca-certificates/ca-certificates_20130119.bb    | 30 ------------
 12 files changed, 335 deletions(-)
 delete mode 100644 meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
 delete mode 100644 meta-oe/classes/vala.bbclass
 delete mode 100644 meta-oe/recipes-devtools/python/python-docutils_0.5.bb
 delete mode 100644 meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta-oe/recipes-devtools/vala/vala.inc
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.16.0.bb
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
 delete mode 100644 meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
Signature · 6 lines
1.8.1.2

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]