summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/base/amd64/packages2
-rw-r--r--profiles/base/package.accept_keywords1
-rw-r--r--sys-kernel/linux/Manifest (renamed from sys-boot/linux/Manifest)0
-rw-r--r--sys-kernel/linux/files/arch.config (renamed from sys-boot/linux/files/arch.config)0
-rwxr-xr-xsys-kernel/linux/files/config_prepare.sh (renamed from sys-boot/linux/files/config_prepare.sh)0
-rw-r--r--sys-kernel/linux/files/overlay.config (renamed from sys-boot/linux/files/overlay.config)5
-rw-r--r--sys-kernel/linux/linux-4.10.13.ebuild (renamed from sys-boot/linux/linux-4.10.13.ebuild)0
7 files changed, 4 insertions, 4 deletions
diff --git a/profiles/base/amd64/packages b/profiles/base/amd64/packages
index f1b8976..582ca25 100644
--- a/profiles/base/amd64/packages
+++ b/profiles/base/amd64/packages
@@ -8,4 +8,4 @@ sys-apps/smartmontools
sys-boot/efibootmgr
sys-boot/syslinux
sys-boot/myinitramfs
-sys-boot/linux
+sys-kernel/linux
diff --git a/profiles/base/package.accept_keywords b/profiles/base/package.accept_keywords
index b1c1df1..15a9a6d 100644
--- a/profiles/base/package.accept_keywords
+++ b/profiles/base/package.accept_keywords
@@ -1 +1,2 @@
+sys-kernel/linux-firmware ~amd64
net-p2p/syncthing ~amd64
diff --git a/sys-boot/linux/Manifest b/sys-kernel/linux/Manifest
index 1b50777..1b50777 100644
--- a/sys-boot/linux/Manifest
+++ b/sys-kernel/linux/Manifest
diff --git a/sys-boot/linux/files/arch.config b/sys-kernel/linux/files/arch.config
index 32c284d..32c284d 100644
--- a/sys-boot/linux/files/arch.config
+++ b/sys-kernel/linux/files/arch.config
diff --git a/sys-boot/linux/files/config_prepare.sh b/sys-kernel/linux/files/config_prepare.sh
index 0d3409f..0d3409f 100755
--- a/sys-boot/linux/files/config_prepare.sh
+++ b/sys-kernel/linux/files/config_prepare.sh
diff --git a/sys-boot/linux/files/overlay.config b/sys-kernel/linux/files/overlay.config
index b8ff91c..0d3cbeb 100644
--- a/sys-boot/linux/files/overlay.config
+++ b/sys-kernel/linux/files/overlay.config
@@ -1,8 +1,7 @@
# No logo
CONFIG_LOGO=n
-# Include firmware to kernel as multiple kernels would create collision
-# TODO solve this some other way
-CONFIG_FIRMWARE_IN_KERNEL=y
+# We have firmware from other package
+CONFIG_PREVENT_FIRMWARE_BUILD=y
# Enable incompatible v3 process information file format
CONFIG_BSD_PROCESS_ACCT_V3=y
diff --git a/sys-boot/linux/linux-4.10.13.ebuild b/sys-kernel/linux/linux-4.10.13.ebuild
index 689d5a2..689d5a2 100644
--- a/sys-boot/linux/linux-4.10.13.ebuild
+++ b/sys-kernel/linux/linux-4.10.13.ebuild