From 3665ee11ce30bf81366e76a4779477f69513eaca Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 10 Apr 2015 17:44:40 +0200 Subject: [PATCH 1/4] images: add snippet for writing the sysmocom.manifest Fixes: SYS#1470 --- recipes-apps/images/image-manifest.inc | 10 ++++++++++ recipes-apps/images/sysmocom-core-image-minimal.bb | 1 + recipes-apps/images/sysmocom-image.inc | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 recipes-apps/images/image-manifest.inc diff --git a/recipes-apps/images/image-manifest.inc b/recipes-apps/images/image-manifest.inc new file mode 100644 index 0000000000..a9089a182d --- /dev/null +++ b/recipes-apps/images/image-manifest.inc @@ -0,0 +1,10 @@ +create_manifest() { + printf "Build_Date: %s\n" "`date -R`" > ${IMAGE_ROOTFS}/etc/sysmocom.manifest + printf "UUID: %s\n" "`uuidgen -r`" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest + printf "Machine: %s\n" "${MACHINE}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest + printf "Image: %s\n" "${IMAGE_BASENAME}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest + printf "Distro: %s\n" "${DISTRO}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest + printf "Distro_Version: %s\n" "${DISTRO_VERSION}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest +} + +IMAGE_PREPROCESS_COMMAND += "create_manifest; " diff --git a/recipes-apps/images/sysmocom-core-image-minimal.bb b/recipes-apps/images/sysmocom-core-image-minimal.bb index a53b9a2fd1..fa50665b16 100644 --- a/recipes-apps/images/sysmocom-core-image-minimal.bb +++ b/recipes-apps/images/sysmocom-core-image-minimal.bb @@ -3,6 +3,7 @@ IMAGE_LINGUAS = " " LICENSE = "MIT" inherit core-image +require recipes-apps/images/image-manifest.inc IMAGE_ROOTFS_SIZE = "8192" diff --git a/recipes-apps/images/sysmocom-image.inc b/recipes-apps/images/sysmocom-image.inc index d7a685d799..3948e7ba87 100644 --- a/recipes-apps/images/sysmocom-image.inc +++ b/recipes-apps/images/sysmocom-image.inc @@ -1,10 +1,11 @@ -DEPENDS = "${MACHINE_EXTRA_RDEPENDS}" +DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native" IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} " IMAGE_LINGUAS = " " IMAGE_FEATURES += " package-management " LICENSE = "MIT" inherit core-image +require recipes-apps/images/image-manifest.inc IMAGE_ROOTFS_SIZE = "32768" From dd3b1def75f81329dfca54d5b39690bc0c629f6c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 13 Apr 2015 16:54:25 +0200 Subject: [PATCH 2/4] tasks-symocom-feed: Make the real ifupdown available and iproute2 --- recipes-apps/tasks/task-sysmocom-feed.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index a65793d46d..608869c954 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r17" +PR = "r18" RDEPENDS_${PN} = "\ task-sysmocom-tools \ @@ -12,4 +12,5 @@ RDEPENDS_${PN} = "\ ppp rsync sed usbutils openvpn iperf \ lcr cronie iproute2 i2c-tools cu \ python-pyserial python-pexpect bridge-utils \ - pciutils nfacct logrotate" + pciutils nfacct logrotate dnsmasq ifupdown \ + logrotate" From 8ba007f078bd8c87bb24a9d303873e6d29d83644 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 10 Apr 2015 19:37:01 +0200 Subject: [PATCH 3/4] jsonrpclib: add recipe for jsonrpclib - the git version was choosen because it has some fixes for newer python versions - test where done with the test file from the github repository and some unixsocket tests failed Related: SYS#1082 --- recipes-extra/python/python-jsonrpclib_git.bb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes-extra/python/python-jsonrpclib_git.bb diff --git a/recipes-extra/python/python-jsonrpclib_git.bb b/recipes-extra/python/python-jsonrpclib_git.bb new file mode 100644 index 0000000000..867b7b4803 --- /dev/null +++ b/recipes-extra/python/python-jsonrpclib_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Implementation of the JSON-RPC specification for python" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cdbf8d74b765504fbdf8e154bb4458a1" +PV = "0.1.3+git${SRCPV}" +PR = "r0" + +SRCREV = "b59217c971603a30648b041c84f85159afb2ec31" + +SRC_URI = "git://github.com/joshmarshall/jsonrpclib.git" +S = "${WORKDIR}/git" + +inherit distutils + +# python-threading is needed for SimpleJSONRPCServer +RDEPENDS_${PN} = "\ + python-json \ + python-xmlrpc \ + python-threading \ +" From ad976e4eb3c8c531d6fe808b5d68c48e05a81877 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 13 Apr 2015 16:55:43 +0200 Subject: [PATCH 4/4] task-sysmocom-feed: Make the python json rpc available --- recipes-apps/tasks/task-sysmocom-feed.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index 608869c954..209719f555 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r18" +PR = "r19" RDEPENDS_${PN} = "\ task-sysmocom-tools \ @@ -13,4 +13,4 @@ RDEPENDS_${PN} = "\ lcr cronie iproute2 i2c-tools cu \ python-pyserial python-pexpect bridge-utils \ pciutils nfacct logrotate dnsmasq ifupdown \ - logrotate" + logrotate python-jsonrpclib"