Fix version and keyword conflicts

flatcar-archive · Nov 26, 2019 · 2035f07 · 2035f07
1 parent 55cb7b2
commit 2035f07
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/profiles/coreos/arm64/package.accept_keywords b/profiles/coreos/arm64/package.accept_keywords
@@ -70,3 +70,8 @@
 =virtual/libudev-232 ~arm64
 =virtual/libusb-1-r2 ~arm64
 =virtual/perl-File-Path-2.130.0 ~arm64
+
+=app-emulation/cri-o-1.15.2 **
+=net-vpn/wireguard-0.0.20190406 ~arm64
+=app-emulation/cri-tools-1.16.1 **
+=net-misc/cni-plugins-0.7.5 **
diff --git a/sys-kernel/coreos-kernel/coreos-kernel-5.3.11.ebuild b/sys-kernel/coreos-kernel/coreos-kernel-5.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-COREOS_SOURCE_REVISION="-r1"
+COREOS_SOURCE_REVISION=""
 inherit coreos-kernel
 
 DESCRIPTION="CoreOS Linux kernel"

diff --git a/sys-kernel/coreos-modules/coreos-modules-5.3.11.ebuild b/sys-kernel/coreos-modules/coreos-modules-5.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-COREOS_SOURCE_REVISION="-r1"
+COREOS_SOURCE_REVISION=""
 inherit coreos-kernel savedconfig
 
 DESCRIPTION="CoreOS Linux kernel modules"

diff --git a/...coreos-modules/files/arm64_defconfig-4.19 → .../coreos-modules/files/arm64_defconfig-5.3 b/...coreos-modules/files/arm64_defconfig-4.19 → .../coreos-modules/files/arm64_defconfig-5.3
diff --git a/...el/coreos-modules/files/commonconfig-4.19 → ...nel/coreos-modules/files/commonconfig-5.3 b/...el/coreos-modules/files/commonconfig-4.19 → ...nel/coreos-modules/files/commonconfig-5.3