From 6688883299abac05ff5db46c166349258820f4fc Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 6 Jul 2014 21:51:38 -0700 Subject: [PATCH 1/5] profiles: re-add udev to default USE flags Reapply 943574b4, build_packages can handle the circular dependency that this introduces between systemd and util-linux now. --- .../coreos-overlay/profiles/features/systemd/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults index 76a820ac5b..ded4466d96 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults @@ -1,2 +1,2 @@ -USE="systemd" +USE="systemd udev" BOOTSTRAP_USE="$BOOTSTRAP_USE udev" From badd38240c1f03a7ad77ff6e73f4362a7309f066 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 19 Jul 2014 14:20:50 -0700 Subject: [PATCH 2/5] profiles: do not disable perl's gdbm use flag It appears turning off this flag does not actually prevent perl from trying to build against gdbm. Enable the flag so dependencies are consistent with perl's actual behavior. --- .../third_party/coreos-overlay/profiles/coreos/base/package.use | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 7153403a08..c5f0e50d90 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -63,7 +63,6 @@ app-emulation/xen-tools -ocaml -hvm -xend -pygrub -qemu -flask -screen -doc amd6 sys-apps/gptfdisk -icu # for profile migration -dev-lang/perl -gdbm dev-libs/apr-util -gdbm sys-libs/gdbm berkdb From fa7075a057115682fa80c83b44de281e96d274bd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 19 Jul 2014 14:46:27 -0700 Subject: [PATCH 3/5] iproute2: restore two mistakenly deleted patches Commit 3d5e4758 pruned a little too deeply. --- .../iproute2/files/iproute2-3.1.0-mtu.patch | 48 +++++++++++++++++++ .../files/iproute2-3.1.0-no-ipv6.patch | 41 ++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch new file mode 100644 index 0000000000..fa12dad2d7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch @@ -0,0 +1,48 @@ +http://bugs.gentoo.org/291907 + +This patch was merged from two patches extracted from this thread: +http://markmail.org/thread/qkd76gpdgefpjlfn + +tc_stab.c: small fixes to commandline help + + +tc_core.c: +As kernel part of things relies on cell align which is always set to -1, +I also added it to userspace computation stage. This way if someone +specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't +end with tsize supporting mtu 4096 suddenly, New default mtu is also set +to 2048 (disregarding weirdness of setting mtu to such values). + + +Unless I missed something, this is harmless and feels cleaner, but if it's +not allowed, documentation will have to be changed back to 2047 + extra +explanation as well. + +--- iproute2/tc/tc_core.c ++++ iproute2/tc/tc_core.c +@@ -155,12 +155,12 @@ + } + + if (s->mtu == 0) +- s->mtu = 2047; ++ s->mtu = 2048; + if (s->tsize == 0) + s->tsize = 512; + + s->cell_log = 0; +- while ((s->mtu >> s->cell_log) > s->tsize - 1) ++ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1) + s->cell_log++; + + *stab = malloc(s->tsize * sizeof(__u16)); +--- iproute2/tc/tc_stab.c ++++ iproute2/tc/tc_stab.c +@@ -32,7 +32,7 @@ + fprintf(stderr, + "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n" + " [ overhead BYTES ] [ linklayer TYPE ] ...\n" +- " mtu : max packet size we create rate map for {2047}\n" ++ " mtu : max packet size we create size table for {2048}\n" + " tsize : how many slots should size table have {512}\n" + " mpu : minimum packet size used in rate computations\n" + " overhead : per-packet size overhead used in rate computations\n" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch new file mode 100644 index 0000000000..1282a1b59f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/326849 + +allow ipv6 to be disabled + +--- a/ip/iptunnel.c ++++ b/ip/iptunnel.c +@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv) + break; + case AF_INET: + break; +- /* +- * This is silly enough but we have no easy way to make it +- * protocol-independent because of unarranged structure between +- * IPv4 and IPv6. +- */ +- case AF_INET6: +- return do_ip6tunnel(argc, argv); + default: + fprintf(stderr, "Unsupported family:%d\n", preferred_family); + exit(-1); +--- a/ip/Makefile ++++ b/ip/Makefile +@@ -1,6 +1,6 @@ + IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ +- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ +- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \ ++ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ ++ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \ + ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ + iplink_vlan.o link_veth.o link_gre.o iplink_can.o \ + iplink_macvlan.o iplink_macvtap.o ipl2tp.o +--- a/ip/ipmonitor.c ++++ b/ip/ipmonitor.c +@@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who, + if (n->nlmsg_type == RTM_NEWPREFIX) { + if (prefix_banner) + fprintf(fp, "[PREFIX]"); +- print_prefix(who, n, arg); + return 0; + } + if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { From ed41ed035b80c1a066077a72b04b0928adfdca69 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 19 Jul 2014 14:59:56 -0700 Subject: [PATCH 4/5] coreos-init: update with some minor fixes - Removes ld.so.cache generator, systemd 215 does this. - Fix udev rule for GCE compatibility. --- ...oreos-init-0.0.1-r93.ebuild => coreos-init-0.0.1-r94.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r93.ebuild => coreos-init-0.0.1-r94.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r93.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r94.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r93.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r94.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index fac748028c..51872d3810 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="36ec76f699616de505c1c6c12be228b9d662f995" + CROS_WORKON_COMMIT="72a09605a52c22f1b2e8e85ebf022cc5cd0d2ab2" KEYWORDS="amd64 arm x86" fi From d8abb0dd2863ed084f7f67e0392115b89267e1b0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 19 Jul 2014 15:19:51 -0700 Subject: [PATCH 5/5] systemd: fix build dependencies for man pages --- .../coreos-overlay/sys-apps/systemd/systemd-215-r6.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r6.ebuild index a6e16311ff..2984be93d3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r6.ebuild @@ -89,12 +89,15 @@ DEPEND="${COMMON_DEPEND} python? ( dev-python/lxml[${PYTHON_USEDEP}] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 )" -if [[ ${PV} == *9999 ]]; then +# this ebuild patches the man source xml DEPEND="${DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 + dev-libs/libxslt:0" + +if [[ ${PV} == *9999 ]]; then +DEPEND="${DEPEND} dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0"