summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-kernel/bzImage/Manifest2
-rw-r--r--sys-kernel/bzImage/bzImage-0.1.ebuild111
-rw-r--r--sys-kernel/bzImage/bzImage-0.ebuild77
-rw-r--r--virtual/miller-base/Manifest2
-rw-r--r--virtual/miller-base/miller-base-10.10.ebuild (renamed from virtual/miller-base/miller-base-10.9.2-r1.ebuild)13
5 files changed, 4 insertions, 201 deletions
diff --git a/sys-kernel/bzImage/Manifest b/sys-kernel/bzImage/Manifest
deleted file mode 100644
index 53a95b7..0000000
--- a/sys-kernel/bzImage/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD bzImage-0.1.ebuild 2641 BLAKE2B e0a4c45350e0c6b6c2f7bf1fd40c12144282ea77d17f05c4486652633e0df427854e0e6d0ba863be7f464ae61f7d022892b67fb5182e05336f5f7af76b0d825f SHA512 ab2fca36bf3fcbad3f1b6a73bb226bd137519fafe890709cb90953cb5d6600e6404a15fbff2cfae07b62f754a10180edd88548e48fa681edb0776c5d61620bd8
-EBUILD bzImage-0.ebuild 1730 BLAKE2B 522a27a1b1ca50c7cc9e90b1fb792e9d5ac2205834588104f3da333e21401385343f8d419aabcbe417fd7b663ae87d457cd4e5ebd2236e320aded1dd7791f2dc SHA512 bb155fc7578c53b82e14ff3cbbb41018d4272fcad4199c1d417b12ca0278922a04a7b7925a6b4e9df3a70c107dec9fbf2a7a3fdea415847efeafc82e18116627
diff --git a/sys-kernel/bzImage/bzImage-0.1.ebuild b/sys-kernel/bzImage/bzImage-0.1.ebuild
deleted file mode 100644
index d186bae..0000000
--- a/sys-kernel/bzImage/bzImage-0.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info
-
-DESCRIPTION="Build and install a kernel, modules and initramfs with genkernel"
-HOMEPAGE="https://git.randomdan.homeip.net/repo/portage/tree/sys-kernel/bzImage"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lvm mdadm dmraid +e2fs zfs btrfs iscsi +busybox cryptsetup gpg netboot"
-
-DEPEND="
-sys-kernel/gentoo-sources:=
-sys-kernel/genkernel-next[dmraid=,cryptsetup=,gpg=,iscsi=,mdadm=]
-"
-RDEPEND=""
-BDEPEND="${DEPEND}"
-
-enableif() {
- usex $1 --${2:-$1} --no-${2:-$1}
-}
-
-src_prepare() {
- if [[ -z ${KBUILD_OUTPUT} ]] ; then
- die "KBUILD_OUTPUT must be set"
- fi
- default
-}
-
-src_unpack() {
- mkdir -p ${S}
-}
-
-src_configure() {
- local cfg=$(ls -1t /etc/kernels/* | head -n 1)
- if [[ -f $cfg ]] ; then
- einfo "Using $cfg for config..."
- cp $cfg ${S}/.config || die "Failed to copy config"
- elif [[ -f /proc/config.gz ]] ; then
- einfo "Using running config..."
- zcat /proc/config.gz > ${S}/.config || die "Failed to copy config"
- else
- ewarn "Using default config..."
- fi
- einfo "Building $KV_FULL"
-
- GENKERNELOPTS="
- --kerneldir=${KERNEL_DIR}
- --kernel-outputdir=${S}
- --logfile=${TMP}/genkernel.log
- --tempdir=${TMP}/genkernel
- --bootdir=${D}/boot
- --firmware-dst=${D}/lib/firmware
- --module-prefix=${D}
- --no-save-config
- --no-clean
- $(enableif lvm)
- $(enableif mdadm)
- $(enableif dmraid)
- $(enableif e2fs e2fsprogs)
- $(enableif zfs)
- $(enableif btrfs)
- $(enableif iscsi)
- $(enableif busybox)
- $(enableif cryptsetup luks)
- $(enableif gpg)
- $(enableif netboot)
- "
- einfo "Base genkernel options ${GENKERNELOPTS}"
- set_arch_to_kernel
-}
-
-src_compile() {
- genkernel $GENKERNELOPTS --no-install kernel || die genkernel failed
-}
-
-src_install() {
- insinto /etc/kernels
- newins .config ${KV_FULL}
-
- addwrite /etc/ld.so.cache~
- addwrite /etc/ld.so.cache
- mkdir -p ${D}/boot ${D}/lib/firmware
- genkernel $GENKERNELOPTS --install all || die genkernel failed
- emake -C ${KERNEL_DIR} O=${S} clean
-
- dosym ${KBUILD_OUTPUT} /lib/modules/${KV_FULL}/build
- insinto ${KBUILD_OUTPUT}
- doins -r .config Module.symvers include
- insinto ${KBUILD_OUTPUT}/arch
- doins -r arch/${ARCH}
- exeinto ${KBUILD_OUTPUT}/tools/objtool
- doexe tools/objtool/objtool
- exeinto ${KBUILD_OUTPUT}/scripts
- doexe scripts/kallsyms
- exeinto ${KBUILD_OUTPUT}/scripts/basic
- doexe scripts/basic/fixdep
- exeinto ${KBUILD_OUTPUT}/scripts/kconfig
- doexe scripts/kconfig/conf
- exeinto ${KBUILD_OUTPUT}/scripts/mod
- doexe scripts/mod/mk_elfconfig scripts/mod/modpost
-}
-
-pkg_postinst() {
- grub-mkconfig -o /boot/grub/grub.cfg
-}
-
diff --git a/sys-kernel/bzImage/bzImage-0.ebuild b/sys-kernel/bzImage/bzImage-0.ebuild
deleted file mode 100644
index a953d1a..0000000
--- a/sys-kernel/bzImage/bzImage-0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Build and install a kernel, modules and initramfs with genkernel"
-HOMEPAGE="https://git.randomdan.homeip.net/repo/portage/tree/sys-kernel/bzImage"
-SRC_URI=""
-RESTRICT="userpriv"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lvm mdadm dmraid +e2fs zfs btrfs iscsi +busybox cryptsetup gpg netboot"
-
-DEPEND="
-sys-kernel/gentoo-sources:=[symlink]
-sys-kernel/genkernel-next[dmraid=,cryptsetup=,gpg=,iscsi=,mdadm=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-enableif() {
- usex $1 --${2:-$1} --no-${2:-$1}
-}
-
-src_unpack() {
- mkdir -p ${S}
-}
-
-src_configure() {
- local cfg=$(ls -1t /etc/kernels/* | head -n 1)
- if [[ -f $cfg ]] ; then
- einfo "Using $cfg for config..."
- cp $cfg $WORKDIR/.config || die "Failed to copy config"
- elif [[ -f /proc/config.gz ]] ; then
- einfo "Using running config..."
- zcat /proc/config.gz > $WORKDIR/.config || die "Failed to copy config"
- else
- einfo "Using default config..."
- fi
-}
-
-src_install() {
- GENKERNELOPTS="
- --kernel-outputdir=$WORKDIR
- --logfile=$TMP/genkernel.log
- --tempdir=$TMP/tmp
- --kernel-cc=/usr/lib/ccache/bin/cc
- --utils-cc=/usr/lib/ccache/bin/cc
- --bootdir=${D}/boot
- --module-prefix=${D}
- $(enableif lvm)
- $(enableif mdadm)
- $(enableif dmraid)
- $(enableif e2fs e2fsprogs)
- $(enableif zfs)
- $(enableif btrfs)
- $(enableif iscsi)
- $(enableif busybox)
- $(enableif cryptsetup luks)
- $(enableif gpg)
- $(enableif netboot)
- "
-
- addwrite /etc/kernels
- addwrite /var/lib/genkernel
- addwrite /etc/ld.so.cache~
- addwrite /etc/ld.so.cache
- mkdir ${D}/boot
- genkernel --no-clean $GENKERNELOPTS all
-}
-
-pkg_postinst() {
- grub-mkconfig -o /boot/grub/grub.cfg
-}
-
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 02526eb..c3ab2a4 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -12,4 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
AUX weekly-av-scan.cron 1591 BLAKE2B 8262ff9f7c8aadf503b8fbf0c283f87d619f1ee174bd52762cd421064e3ef6ad301dbfbfdf557334e76c11adc963976417c3275e8c1167d7c609cbdda201ead9 SHA512 6d5ca06bfdb020d1435b51837b4f2f8676cab808e7ffdf39be40e822858f0b7150d16d5fce991fab026c236fd3a32e1ff9a0f7eca62a679e77d1799ed15e2366
AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.9.2-r1.ebuild 3871 BLAKE2B 5f5b8e1b8251f3b7ea1bca795951c0c29bde5836ab80d70530fda37c2061d27c8e7feb83b4011620d687cc668f0c7fb6c5e81b2840f887d8500dd37806b5a5a2 SHA512 cd35d00145be2d7a520e16df40e01ff1c5c8ce4b94a1cd1832199fd482e46589b00dd66f4b17d5d975bababfde34a2f27bdd19e22bc35113100f6a604daec941
+EBUILD miller-base-10.10.ebuild 3671 BLAKE2B 101163711909650ff0affef982bc08e53f6b6509031a6d65ef6a7a5e02dbf5627192d13891367fc523121c7b82e3b98caf6ff8f081fdee52aa6e3113f6a4af7a SHA512 24874d3073077d6846114b661b68e741e160e7eb7c18283f7ab55dd3399be505e70bb25a15da7c7332fe700f3ed8a0edd1eeaec0c5a9d6ea56f50533b2aca30f
diff --git a/virtual/miller-base/miller-base-10.9.2-r1.ebuild b/virtual/miller-base/miller-base-10.10.ebuild
index d9a7c7e..cc5d2aa 100644
--- a/virtual/miller-base/miller-base-10.9.2-r1.ebuild
+++ b/virtual/miller-base/miller-base-10.10.ebuild
@@ -5,7 +5,7 @@ DESCRIPTION="Virtual for base systems"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
-minimal autoupdate autoshutdown autoservicerestart sw-suspend mdadm
+minimal autoupdate autoshutdown autoservicerestart mdadm
video_cards_nvidia video_cards_nouveau firmware ischroot"
RDEPEND="
@@ -31,13 +31,14 @@ RDEPEND="
sys-fs/lvm2
>=sys-boot/grub-2
sys-apps/busybox
- sys-kernel/genkernel-next
sys-apps/pciutils
sys-apps/usbutils
samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) )
firmware? ( sys-kernel/linux-firmware )
app-admin/logrotate
video_cards_nouveau? ( sys-firmware/nvidia-firmware )
+ app-antivirus/clamav
+ sys-kernel/gentoo-kernel
)
sys-process/cronie
>=app-portage/gentoolkit-0.2.1
@@ -59,14 +60,6 @@ RDEPEND="
!hardened? (
sys-devel/prelink
)
- !ischroot? (
- app-antivirus/clamav
- !sw-suspend? ( sys-kernel/gentoo-sources )
- sw-suspend? ( sys-apps/tuxonice-userui
- || ( sys-kernel/tuxonice-sources sys-kernel/pf-sources )
- )
- sys-kernel/bzImage
- )
app-misc/screen
app-vim/gentoo-syntax
sys-auth/pam_ldap