Merge commit 'e423b30a83bf4ad14a0a3db619faccd979aa4573' into edison
This commit is contained in:
commit
5d46944934
|
@ -1,5 +1,5 @@
|
||||||
DEPENDS = "${MACHINE_EXTRA_RDEPENDS}"
|
DEPENDS = "${MACHINE_EXTRA_RDEPENDS}"
|
||||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} wget"
|
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
|
||||||
IMAGE_LINGUAS = " "
|
IMAGE_LINGUAS = " "
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
DEPENDS = "virtual/kernel"
|
DEPENDS = "virtual/kernel"
|
||||||
ALLOW_EMPTY = "1"
|
ALLOW_EMPTY = "1"
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
|
|
||||||
RDEPENDS_task-sysmocom = "\
|
RDEPENDS_task-sysmocom = "\
|
||||||
task-sysmocom-tools \
|
task-sysmocom-tools \
|
||||||
|
@ -14,5 +14,7 @@ RDEPENDS_task-sysmocom = "\
|
||||||
osmo-gbproxy \
|
osmo-gbproxy \
|
||||||
osmo-nitb \
|
osmo-nitb \
|
||||||
ipaccess-utils \
|
ipaccess-utils \
|
||||||
|
wget \
|
||||||
|
ca-certificates \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
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
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
DESCRIPTION = "Common CA certificates"
|
||||||
|
HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
|
||||||
|
SECTION = "misc"
|
||||||
|
LICENSE = "GPLv2+"
|
||||||
|
LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5"
|
||||||
|
|
||||||
|
SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \
|
||||||
|
file://0001-update-ca-certificates-remove-c-rehash.patch"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "5105d4cc086f0d4ecf7bf2e4c4667289"
|
||||||
|
SRC_URI[sha256sum] = "878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9"
|
||||||
|
|
||||||
|
inherit autotools allarch
|
||||||
|
|
||||||
|
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} () {
|
||||||
|
if [ -n "$D" ] ; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
${sbindir}/update-ca-certificates
|
||||||
|
}
|
||||||
|
|
||||||
|
CONFFILES_${PN} = "/etc/ca-certificates.conf"
|
Loading…
Reference in New Issue