* [meta-oe,meta-gnome][PATCH 1/6] midori: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 2/6] vala: remove Paul Eggleton
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
This is now in OE-Core as of 88d9d7e47dedd9bfa26da860e6ff77ee5206d9e8.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb b/meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
deleted file mode 100644
index f4f6221..0000000
--- a/meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
+++ /dev/null
@@ -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"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe,meta-gnome][PATCH 2/6] vala: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 1/6] midori: remove Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 3/6] classes/vala: remove Paul Eggleton
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
This is now in OE-Core as of 649b48557d8702daaf4f28482848ab0b07abed83.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
...-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
diff --git a/meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/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 file mode 100644
index e6c7941..0000000
--- a/meta-oe/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-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 <Martin.Jansa@gmail.com>
----
- 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
-
diff --git a/meta-oe/recipes-devtools/vala/vala.inc b/meta-oe/recipes-devtools/vala/vala.inc
deleted file mode 100644
index 6cdc605..0000000
--- a/meta-oe/recipes-devtools/vala/vala.inc
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-devtools/vala/vala_0.16.0.bb b/meta-oe/recipes-devtools/vala/vala_0.16.0.bb
deleted file mode 100644
index 92120b4..0000000
--- a/meta-oe/recipes-devtools/vala/vala_0.16.0.bb
+++ /dev/null
@@ -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"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe,meta-gnome][PATCH 3/6] classes/vala: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 1/6] midori: remove Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 2/6] vala: remove Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 4/6] python-docutils: remove Paul Eggleton
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
This is now in OE-Core as of 807285c751862aaa775db5a13293007bfb3c29df.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta-oe/classes/vala.bbclass | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 meta-oe/classes/vala.bbclass
diff --git a/meta-oe/classes/vala.bbclass b/meta-oe/classes/vala.bbclass
deleted file mode 100644
index c7db08c..0000000
--- a/meta-oe/classes/vala.bbclass
+++ /dev/null
@@ -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 \
-"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe,meta-gnome][PATCH 4/6] python-docutils: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
` (2 preceding siblings ...)
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 3/6] classes/vala: remove Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 5/6] libnotify: remove Paul Eggleton
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
This is now in OE-Core as of 1bc1ff887c29376bb0d05beee1bbc2cf25b08419.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta-oe/recipes-devtools/python/python-docutils_0.5.bb b/meta-oe/recipes-devtools/python/python-docutils_0.5.bb
deleted file mode 100644
index e4c8a7d..0000000
--- a/meta-oe/recipes-devtools/python/python-docutils_0.5.bb
+++ /dev/null
@@ -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"
-
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe,meta-gnome][PATCH 5/6] libnotify: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
` (3 preceding siblings ...)
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 4/6] python-docutils: remove Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 6/6] ca-certificates: remove Paul Eggleton
2013-09-03 17:54 ` [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Martin Jansa
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
This is now in OE-Core as of f72c0ff46d6895978e7e5230cb882d8eee4005ba
(libnotify3 remains).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
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
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
deleted file mode 100644
index 0a590e3..0000000
--- a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
+++ /dev/null
@@ -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
-}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe,meta-gnome][PATCH 6/6] ca-certificates: remove
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
` (4 preceding siblings ...)
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 5/6] libnotify: remove Paul Eggleton
@ 2013-08-28 10:43 ` Paul Eggleton
2013-09-03 17:54 ` [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Martin Jansa
6 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2013-08-28 10:43 UTC (permalink / raw)
To: openembedded-devel
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).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../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
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc b/meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc
deleted file mode 100644
index ac993bc..0000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates-20130119.inc
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
deleted file mode 100644
index 171d6a0..0000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
+++ /dev/null
@@ -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}
-}
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
deleted file mode 100644
index ccb0efc..0000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001
-From: Ulf Samuelsson <ulf@emagii.com>
-Date: Tue, 28 Feb 2012 06:42:58 +0100
-Subject: [PATCH] update-ca-certificates: remove c rehash
-
-Updated earlier patch to apply clean on 2012-02-12
-Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
----
- sbin/update-ca-certificates | 20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
-index 5375950..c567e3d 100755
---- a/sbin/update-ca-certificates
-+++ b/sbin/update-ca-certificates
-@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE"
- ADDED_CNT=$(wc -l < "$ADDED")
- REMOVED_CNT=$(wc -l < "$REMOVED")
-
--if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
--then
-- # only run if set of files has changed
-- if [ "$verbose" = 0 ]
-- then
-- c_rehash . > /dev/null
-- else
-- c_rehash .
-- fi
--fi
-+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
-+#then
-+# # only run if set of files has changed
-+# if [ "$verbose" = 0 ]
-+# then
-+# c_rehash . > /dev/null
-+# else
-+# c_rehash .
-+# fi
-+#fi
-
- chmod 0644 "$TEMPBUNDLE"
- mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
---
-1.7.4.1
-
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
deleted file mode 100644
index 689fdd9..0000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Pending
-
-From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 19 Mar 2013 17:14:33 +0100
-Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- sbin/update-ca-certificates | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
-index c567e3d..923b68a 100755
---- a/sbin/update-ca-certificates
-+++ b/sbin/update-ca-certificates
-@@ -37,11 +37,11 @@ do
- shift
- done
-
--CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
-+CERTSCONF=$SYSROOT/etc/ca-certificates.conf
-+CERTSDIR=$SYSROOT/usr/share/ca-certificates
-+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
--ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR=$SYSROOT/etc/ssl/certs
-
- cleanup() {
- rm -f "$TEMPBUNDLE"
-@@ -64,9 +64,9 @@ add() {
- PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
- -e 's/[()]/=/g' \
- -e 's/,/_/g').pem"
-- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
-+ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ]
- then
-- ln -sf "$CERT" "$PEM"
-+ ln -sf "${CERT##$SYSROOT}" "$PEM"
- echo +$PEM >> "$ADDED"
- fi
- cat "$CERT" >> "$TEMPBUNDLE"
-@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
-
- echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
-
--HOOKSDIR=/etc/ca-certificates/update.d
-+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
- echo -n "Running hooks in $HOOKSDIR...."
- VERBOSE_ARG=
- [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
---
-1.7.10.4
-
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
deleted file mode 100644
index 504190f..0000000
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
+++ /dev/null
@@ -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"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core
2013-08-28 10:43 [meta-oe, meta-gnome][PATCH 0/6] Removals of recipes/classes now in OE-Core Paul Eggleton
` (5 preceding siblings ...)
2013-08-28 10:43 ` [meta-oe,meta-gnome][PATCH 6/6] ca-certificates: remove Paul Eggleton
@ 2013-09-03 17:54 ` Martin Jansa
6 siblings, 0 replies; 8+ messages in thread
From: Martin Jansa @ 2013-09-03 17:54 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2923 bytes --]
On Wed, Aug 28, 2013 at 11:43:22AM +0100, Paul Eggleton wrote:
> 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!
>
> 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
>
> --
> 1.8.1.2
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread