diff options
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/Manifest.gz | bin | 14992 -> 14996 bytes | |||
-rw-r--r-- | app-emulation/cloud-init/Manifest | 4 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-22.2.2.ebuild | 3 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-9999.ebuild | 2 | ||||
-rw-r--r-- | app-emulation/vendor-reset/Manifest | 5 | ||||
-rw-r--r-- | app-emulation/vendor-reset/files/Respect-eselect-kernel.patch | 13 | ||||
-rw-r--r-- | app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild | 19 | ||||
-rw-r--r-- | app-emulation/vendor-reset/vendor-reset-9999.ebuild | 19 |
8 files changed, 18 insertions, 47 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex f9621c8796f8..dfa59b02ae8f 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index ead8c30e7803..e1b29e536344 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1,4 +1,4 @@ DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae SHA512 18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf -EBUILD cloud-init-22.2.2.ebuild 2303 BLAKE2B dd14192049501a05542cd32c78833b0757e9c250a527081b6923743fda766873eda41a7e97aaf407921d7081b1499b67e528b5e5fd70f08b3523568480969132 SHA512 e90ee7bdf5df9a42deecfa6e5f004cc4752437e6807cf4ebb87be72a32b489f5d26a58612f6168653e0619ae6d463a3a36723371761a7cca7a54b50e87238c12 -EBUILD cloud-init-9999.ebuild 2262 BLAKE2B d9e5722888f36579fed20e1adcb91e36a465395a19f5cf958cd85f8c25c229ee33515bc0a2d98f85f1f470b3bad53c20e7906551778237dfeaea97b062e3c282 SHA512 12ffc5dbdffce1927ff142e7e0a5be049543661b7aeb6643b3b6c7b65c462acc7969f31bcc120d2975e0b39624e89952adc17d2fc89f55878a2fb1350376985a +EBUILD cloud-init-22.2.2.ebuild 2354 BLAKE2B da3cadf5eba83c92ac5063ba811a0a7df29d62ca733600c2ec502c34badd7d66371882d989fc96bc3603af208a210d628316edadec59d6ba116e44013e5ec9f6 SHA512 a738fbdef4b7bb644d5dac5b12f6a749bce23df03d5c937dc85475b8309c05ade183e1a47c77fcd8618bd421bd90757889dd2e6b347f224967289678e07d5975 +EBUILD cloud-init-9999.ebuild 2320 BLAKE2B 214f605d5b3583eab6b9c9756393c8c6b2a170c00459b4afcaa78a33eac5b45132cb62c04e1788263d40d7b33fb84ed65464787a4f2537588876cf6765c54ff6 SHA512 d4ce4ef4f6488a9a0a416b53fe3344e53c37f205991b332db4b73c1ce8b180a4cfd5bfb445b83a3c704022674e05cb201ba848b5d674b1daee7b85dc47f0850e MISC metadata.xml 714 BLAKE2B 22888016216cea9e471f7cef63e94022c344961263a3319508d5b23db64eeaaeb34a470fc51482bf7a0a4cb658dd814f5655393ee4498a7212ccec28caee5256 SHA512 3bd7be60f29d5a1e4a830577c0afc8c5925123f1258a78b82dbc36c8f76f096149db8bcebfaf3b6db5feeab0bc82ccb65d7d71ec12feb4f56027f05eeb930401 diff --git a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild index 082f34e59987..fd7315e5a33e 100644 --- a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init" LICENSE="GPL-3" SLOT="0" -IUSE="test" +IUSE="selinux test" RESTRICT="!test? ( test )" CDEPEND=" @@ -53,6 +53,7 @@ RDEPEND=" sys-apps/iproute2 sys-fs/growpart virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) " distutils_enable_tests pytest diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index 0c21e628855e..2f759e423a9f 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -23,6 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init" LICENSE="GPL-3" SLOT="0" +IUSE="selinux" CDEPEND=" dev-python/jinja[${PYTHON_USEDEP}] @@ -51,6 +52,7 @@ RDEPEND=" sys-apps/iproute2 sys-fs/growpart virtual/logger + selinux? ( sec-policy/selinux-cloudinit ) " distutils_enable_tests pytest diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest index 9de253bb01c0..c74e771bbbed 100644 --- a/app-emulation/vendor-reset/Manifest +++ b/app-emulation/vendor-reset/Manifest @@ -1,6 +1,5 @@ -AUX Respect-eselect-kernel.patch 257 BLAKE2B 7ff9942cccd5e637e56efb5eacc4ce11ce1b0ab318e43a77b6f0fa3adf675ec2646de207e37fc269ea88e52228e9688eb3e7a16934d37e470a935d257ebecf4b SHA512 e2081192dd982c1ddf0f8897d24c5ddb93e0e1ce47973a279146a3165f1b6a00aeae5369c9280552f8317f573c57c9125214b775c3b1614d67780476611db14e AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d DIST vendor-reset-0.1.1_pre20221205.tar.gz 12725340 BLAKE2B 5f2e34b74e83c8f48daad8d2c714872ab23f50cb0fad6b5c7920476b43c2fbfcf5543e923c506dfb2d8c33846e8fdd08c7d20b30fcc053f2c191d813872b44c5 SHA512 87a3c64d917e6a44308115480f14956f65a9f84fef70de29feebe3fcd7d522b59a3dbcb5fc9a340ac9b7a3612a29ed696b4f52648f86a0d877b915c97c5a4cc9 -EBUILD vendor-reset-0.1.1_pre20221205.ebuild 1107 BLAKE2B 8563f6eca8974270007b633d71b70e5240d5c0aba4b5d163353d1214d1e60359aa1c44d06069c2aaad6757c8401c58e77257801ce95c468b19f282dc329da99f SHA512 726dadee17a21f11c6d5742ad54e06a81b7503fb6a207ccc84f1019e4d3c7eac7a030c3d34b30a6ffa82d95fc824938855eb7ed92829ba20366eaa61671ec6da -EBUILD vendor-reset-9999.ebuild 1071 BLAKE2B 3842a78f2258c850701ae5bc466643e5751998bc6e7cb06651e92639e441a1f2d8590bc5a9207ac6e1ed9ba7a6f54f1d4e923bfe445c37ee15219df24f551ece SHA512 20cf56ef5031e134e54d110f573790f5c8a9ed855838dddd0124462c98c21cf6dc3ceb4fbc884e5c3eac938d28fd2b93bef167bed514ac4e7f31ef4e7445da77 +EBUILD vendor-reset-0.1.1_pre20221205.ebuild 1013 BLAKE2B 42c9f05d6cf415d1354684ee4a4dd44307702d4b8ca9b0c2a10d8dfa10a9839dc40b3f56d05e38a75c18f003e91159e3a4cb5b86ef8223085c1986908d293173 SHA512 c5e032c6689018f4536440db778475d5f250349e23becc695dbf18c02a8d4417e24345c712e3b9a819545dc4d459aea4e5c17d6ad4c6932224b532b7650d6140 +EBUILD vendor-reset-9999.ebuild 977 BLAKE2B c36ef7c6a30a953c8d45aca6ed5375be60225bae41272cf1e7c25cf847cb68afb51db8b9a809b9dce315510bdca1aa76408e3f9a1997e7e9bb9d2b9f52680e93 SHA512 83653e7e94acc9e0d83c44dc83c7ad6d92ba1225bd9fd82eaf159400750215a6ff8f661f526fcb74d42ecf65984cf87b6ffe7c67adc2dabb9626c84a9aacd926 MISC metadata.xml 327 BLAKE2B 288b1a0df2469ed01bf576308ddc36c5843b4682333d6e42f0c3603d5bf43cbd6dd9b21cb07020476b9de92445611d04b2c1d5dd54624ed096f166607154137e SHA512 4ceef67a10bc25ed93bd76aaf1ac133b92a362ea0cf030bce21a14f921c3afc868e53e876bde2af91615b1142b3113c2e45a0a3c9a0abe1775c553118e5fbc3d diff --git a/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch b/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch deleted file mode 100644 index 9259a3e12bf2..000000000000 --- a/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index b8a0652..79f60e8 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - USER := $(shell whoami) --KVER ?= $(shell uname -r) --KDIR ?= /lib/modules/$(KVER)/build -+KVER ?= $(KV_FULL) -+KDIR ?= ${KERNEL_DIR} - - all: build - diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild index ceaaa99a4a5f..68ee284aa9d7 100644 --- a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit linux-mod +inherit linux-mod toolchain-funcs if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" @@ -24,26 +24,17 @@ DEPEND="" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" ) +MODULE_NAMES="vendor-reset(extra)" pkg_setup() { local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" linux-mod_pkg_setup - export KV_FULL=${KV_FULL} - export KERNEL_DIR=${KERNEL_DIR} -} - -src_compile() { - set_arch_to_kernel - default + BUILD_TARGETS="build" + BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KDIR=${KERNEL_DIR}" } src_install() { - set_arch_to_kernel - emake \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - install + linux-mod_src_install insinto /etc/modules-load.d/ newins "${FILESDIR}"/modload.conf vendor-reset.conf diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild index a0b2326fc95a..b82d5b15ad5c 100644 --- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild +++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit linux-mod +inherit linux-mod toolchain-funcs if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" @@ -23,26 +23,17 @@ SLOT="0" DEPEND="" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" ) +MODULE_NAMES="vendor-reset(extra)" pkg_setup() { local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" linux-mod_pkg_setup - export KV_FULL=${KV_FULL} - export KERNEL_DIR=${KERNEL_DIR} -} - -src_compile() { - set_arch_to_kernel - default + BUILD_TARGETS="build" + BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KDIR=${KERNEL_DIR}" } src_install() { - set_arch_to_kernel - emake \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - install + linux-mod_src_install insinto /etc/modules-load.d/ newins "${FILESDIR}"/modload.conf vendor-reset.conf |