diff options
11 files changed, 80 insertions, 11 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb index b0fda3502..04dc76d08 100644 --- a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb +++ b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb @@ -58,8 +58,8 @@ RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ " RDEPENDS_${PN} += "containerd runc" -RRECOMMENDS_${PN} = "lxc docker-registry rt-tests" -RRECOMMENDS_${PN} += " kernel-module-dm-thin-pool kernel-module-nf-nat" +RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" +RSUGGESTS_${PN} = "lxc docker-registry rt-tests" DOCKER_PKG="github.com/docker/docker" do_configure[noexec] = "1" @@ -122,7 +122,7 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docke INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" -INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_PARAMS_${PN} = "defaults" do_install() { mkdir -p ${D}/${bindir} diff --git a/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init b/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init index 9c01c7581..2e8eb9e40 100644 --- a/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init +++ b/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init @@ -28,6 +28,7 @@ exec="/usr/bin/$prog" pidfile="/var/run/$prog.pid" lockfile="/var/lock/subsys/$prog" logfile="/var/log/$prog" +other_args="--registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 --raw-logs" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -38,8 +39,8 @@ start() { if ! [ -f $pidfile ]; then printf "Starting $prog:\t" - echo "\n$(date)\n" >> $logfile - "$unshare" -m -- $exec -d $other_args &>> $logfile & + echo -e "\n$(date)\n" >> $logfile + "$unshare" -m -- $exec daemon $other_args &>> $logfile & pid=$! touch $lockfile # wait up to 10 seconds for the pidfile to exist. see diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-gevent_1.0.1.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-gevent_1.0.1.bb index 47f1267ab..8ac12956b 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-gevent_1.0.1.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-gevent_1.0.1.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} += "python-greenlet python-mime python-pprint python-re" SRCNAME = "gevent" -SRC_URI = "http://pypi.python.org/packages/source/g/gevent/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://pypi.python.org/packages/source/g/gevent/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "7b952591d1a0174d6eb6ac47bd975ab6" SRC_URI[sha256sum] = "4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43" diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-m2crypto_0.22.3.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-m2crypto_0.22.3.bb index 95d6eecf4..9814d3def 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-m2crypto_0.22.3.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-m2crypto_0.22.3.bb @@ -14,7 +14,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0ccca7097c1d29fa42e75e9c15c6ff2e" SRCNAME = "M2Crypto" -SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/${SRCNAME}-${PV}.tar.gz \ +SRC_URI = "https://pypi.python.org/packages/source/M/M2Crypto/${SRCNAME}-${PV}.tar.gz \ file://m2crypto-Fix-build-with-SWIG-3.0.5.patch \ " diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-pyyaml_3.11.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-pyyaml_3.11.bb index cb1db8c60..9a6f2f62b 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-pyyaml_3.11.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-pyyaml_3.11.bb @@ -18,7 +18,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17" SRCNAME = "PyYAML" -SRC_URI = "http://pyyaml.org/download/pyyaml/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://pyyaml.org/download/pyyaml/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "f50e08ef0fe55178479d3a618efe21db" SRC_URI[sha256sum] = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8" diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-requests_2.8.1.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-requests_2.8.1.bb index 187f97ae8..d2667800d 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-requests_2.8.1.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-requests_2.8.1.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=58c7e163c9f8ee037246da101c6afd1e" SRCNAME = "requests" -SRC_URI = "http://pypi.python.org/packages/source/r/requests/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://pypi.python.org/packages/source/r/requests/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "a27ea3d72d7822906ddce5e252d6add9" SRC_URI[sha256sum] = "84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b" diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-sphinx_1.3.1.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-sphinx_1.3.1.bb index fe8ad94a3..d8cef3094 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-sphinx_1.3.1.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-sphinx_1.3.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6dd095eaa1e7a662b279daf80ecad7e6" PR = "r0" SRCNAME = "Sphinx" -SRC_URI = "http://pypi.python.org/packages/source/S/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://pypi.python.org/packages/source/S/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "8786a194acf9673464c5455b11fd4332" SRC_URI[sha256sum] = "1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114" diff --git a/import-layers/meta-virtualization/recipes-devtools/python/python-webob_1.4.1.bb b/import-layers/meta-virtualization/recipes-devtools/python/python-webob_1.4.1.bb index 18b380663..e5663637a 100644 --- a/import-layers/meta-virtualization/recipes-devtools/python/python-webob_1.4.1.bb +++ b/import-layers/meta-virtualization/recipes-devtools/python/python-webob_1.4.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5 PR = "r0" SRCNAME = "WebOb" -SRC_URI = "http://pypi.python.org/packages/source/W/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://pypi.python.org/packages/source/W/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "a5c6e8ba5431756e6a5d5ec56047ec94" SRC_URI[sha256sum] = "12f8b98390befc47336d2c0e5bad9cc48609d808eabb3f8675dc1027a3a9e9db" diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch new file mode 100644 index 000000000..357124527 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch @@ -0,0 +1,35 @@ +From 1cec65e45f011c3f52eed5e27d3d816502e36610 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 Mar 2017 12:12:51 -0700 +Subject: [PATCH 1/2] use the linux if_packet.h Interface directly + +Helps compiling with musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/netdev-linux.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c +index a5a9ec1ab..9dd40acdd 100644 +--- a/lib/netdev-linux.c ++++ b/lib/netdev-linux.c +@@ -33,14 +33,13 @@ + #include <linux/pkt_sched.h> + #include <linux/rtnetlink.h> + #include <linux/sockios.h> ++#include <linux/if_packet.h> + #include <sys/types.h> + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <sys/utsname.h> +-#include <netpacket/packet.h> + #include <net/if.h> + #include <net/if_arp.h> +-#include <net/if_packet.h> + #include <net/route.h> + #include <netinet/in.h> + #include <poll.h> +-- +2.12.0 + diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch new file mode 100644 index 000000000..e44ffdaf5 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch @@ -0,0 +1,31 @@ +From 803bde12d32d16eefeae03422a0ac682e0601c43 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 Mar 2017 12:13:30 -0700 +Subject: [PATCH 2/2] Define WAIT_ANY if not provided by system + +POSIX does not define it and uses -1 directly +some libc do not have this definitions + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test-ovn.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/test-ovn.c b/tests/test-ovn.c +index 2e82a6f0d..76e7db9fb 100644 +--- a/tests/test-ovn.c ++++ b/tests/test-ovn.c +@@ -37,6 +37,10 @@ + #include "simap.h" + #include "util.h" + ++#ifndef WAIT_ANY ++# define WAIT_ANY (-1) /* Any process. */ ++#endif ++ + /* --relops: Bitmap of the relational operators to test, in exhaustive test. */ + static unsigned int test_relops; + +-- +2.12.0 + diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb index 1c6252a96..5ecb29ae3 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb @@ -25,6 +25,8 @@ SRC_URI += "\ file://disable_m4_check.patch \ file://kernel_module.patch \ file://openvswitch-ptest-Fix-python-path.patch \ + file://0001-use-the-linux-if_packet.h-Interface-directly.patch \ + file://0002-Define-WAIT_ANY-if-not-provided-by-system.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994" |
