From e787a34bcdba5fe2f46ea5fe14fa4daba5f098b7 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 30 Apr 2019 19:11:59 +0000 Subject: [PATCH] sys-apps/systemd: Pin the v238 network interface naming scheme This should avoid most name compatibility issues during updates. --- .../md5-cache/sys-apps/{systemd-241-r3 => systemd-241-r4} | 2 +- .../coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 | 2 +- .../systemd/{systemd-241-r3.ebuild => systemd-241-r4.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 3 +++ 4 files changed, 5 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{systemd-241-r3 => systemd-241-r4} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-241-r3.ebuild => systemd-241-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r4 similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r3 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r4 index 444f6ffb39..653ffccebf 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r3 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-241-r4 @@ -13,4 +13,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 meson 2780db7405ab6249571d07667ab97ba1 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 3e788d86170dfcd5b06824d898315e18 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 -_md5_=0e0caa67cc0535d68315c1f99993735a +_md5_=ec34b17ddb73e293629c555780d044d7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 index b37fd50d84..d25a3862e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 @@ -13,4 +13,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 meson 2780db7405ab6249571d07667ab97ba1 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 3e788d86170dfcd5b06824d898315e18 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 -_md5_=0e0caa67cc0535d68315c1f99993735a +_md5_=ec34b17ddb73e293629c555780d044d7 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-241-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-241-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-241-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-241-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index f3da87e611..084fe8a2c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -292,6 +292,9 @@ multilib_src_configure() { # Disable the "First Boot Wizard", it isn't very applicable to CoreOS -Dfirstboot=false + # Preserve the v238 network interface naming scheme for compatibility. + -Ddefault-net-naming-scheme=v238 + # unported options, still needed? -Defi-cc="$(tc-getCC)" -Dquotaon-path=/usr/sbin/quotaon