diff options
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/Manifest.gz | bin | 9981 -> 9976 bytes | |||
| -rw-r--r-- | sys-process/atop/Manifest | 3 | ||||
| -rw-r--r-- | sys-process/atop/atop-2.9.0-r1.ebuild (renamed from sys-process/atop/atop-2.9.0.ebuild) | 32 | ||||
| -rw-r--r-- | sys-process/atop/files/atop-2.9.0-netatop-makefile.patch | 42 |
4 files changed, 58 insertions, 19 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz Binary files differindex 62b84bf54696..6b7836cb188d 100644 --- a/sys-process/Manifest.gz +++ b/sys-process/Manifest.gz diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index deecad171114..067c63992ffd 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,5 +1,6 @@ AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d AUX atop-2.7.0-netatop-makefile.patch 901 BLAKE2B 8bd0550e117f6bb8b9143b910681817096f6449fa6143f04378bf86a2ed990eec862af8199044496d659b14f01cff1e56be41741e4102c10ee2ccae4ef4f2106 SHA512 46c034f9ee9b743811f54f7afbc88a72c8ef8f768f749841a52cea3502efcbafe6b04e21045823028599d88984cbbf03ec26eef90592a4c3d6b53296c80b7937 +AUX atop-2.9.0-netatop-makefile.patch 897 BLAKE2B f1f05008e329ea4b96a6b43336fa5df5356c011f6b5eaf3080766e4314040f0629f58f86e9957f095897079f7490fc954ea1ae2556cf8dd7e948497ccdb4d0b4 SHA512 2bd5988ed31af5a528e351ea58a072a06d7d297c7f89591a8b530e507fc342e2aa762c6344cdd8380affeda1e29bb071aee54e4b20379d5a11e21c797ab8fa80 AUX atop.rc-r2 268 BLAKE2B d0673e73ee13d7ac5f1c31544f8f9ba8aefe14c2ebf4e90b090d5a64a308bdd2e42b4131ea5c931e9e2f2386139343cfceb7c04c1378ebd3a260a5d55d0dd5b6 SHA512 07699f1190faa3a8343314b5c8419e7ea49280fef664334f03558907eb5654bc33c7f4baa3fa54cc6f07866c378c984ff81e020e69f0b146c68b8503ab010d0c AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d8cc6c452d1dfeba5478389471778e2a988fd058301bae001139c1396bd9c4a76f2b7f79968377 SHA512 194e9703f34b6a1c749ed5bae3e8708dc625d30e174e285a0998c8aa0d2b1b34da70a3d1db86380abc40615b28a5bdb37b2d511be983da5fd7f154b9686ba343 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02 @@ -11,5 +12,5 @@ DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da8781 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68 EBUILD atop-2.7.1-r1.ebuild 2410 BLAKE2B c18f5c29c904d586563459d392edbda0f6a67baf3a0b24f827a7b2cef97e2ff031c6ac1ff8070e7dec6ff0e6b490020affed5043cc387eeac34d8f7644649914 SHA512 8f302fa0d71d7e2cf3bb889c4ed1706fa3b66c84837994cf7b1fc7903870c6cb4cefc554b268890fb33ac1caacce1cd0a1d1fe5b50e6cbca6d2b36d0f34ea792 EBUILD atop-2.8.1.ebuild 2451 BLAKE2B d79c76e712e2ec0f30bf91b0dbea59f711c5b7b79bc0ecf61c13056277774324f69c2173fa68910bee425526224f25e500446039790d0b4cdb5bc0ce7922ef12 SHA512 1b74732cc14ca020e35257a1110f3fbb83c85845fc75578e923a46ff75835a0fa9ddb7a7c03c9b281151e60c3157003870bdd35294f9576e7f44ba54e9e7351e -EBUILD atop-2.9.0.ebuild 2454 BLAKE2B a3339b1a6e574bcbf4f40aa0f3db247f2f29737a0272730eb0e88db3ea453ddd34e8b4ee4eccab882c1a41ccce6d49f38de4826f1f6cada77b14c32fa8f84f10 SHA512 17e9d67492aa07be1e325f13d6da847adcfae6d92834a678a1951342ab0c09308e4373ae11367eaf4178db74f4bbd0cc484e8f0e35779cad97292ce74e3ac6e4 +EBUILD atop-2.9.0-r1.ebuild 2422 BLAKE2B 1655f3404be6073babbf643a3728ce1cc8be29f65a055ee7aa264ce1d6f7e52087682aa3d1994671e37b841f6850071abc3bb1d92d91d2a380020b41ddf24949 SHA512 134ddbde421a08a25ee5aed953f7376f3217bc5eec7e2697b2d53a6018b1a61b0900a282f8a91c23deab911c4c0cf131fcc7bf0eb5fa129bcfaf20fee06b1406 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274 diff --git a/sys-process/atop/atop-2.9.0.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild index 948c12e87582..9bd1a191304c 100644 --- a/sys-process/atop/atop-2.9.0.ebuild +++ b/sys-process/atop/atop-2.9.0-r1.ebuild @@ -8,11 +8,11 @@ EAPI=8 NETATOP_VER=3.1 # Controls 'netatop' kernel module -MODULES_OPTIONAL_USE="modules" -NETATOP_P=net${PN}-${NETATOP_VER} +MODULES_OPTIONAL_IUSE="modules" +NETATOP_P=netatop-${NETATOP_VER} NETATOP_S="${WORKDIR}"/${NETATOP_P} -inherit linux-info linux-mod systemd toolchain-funcs +inherit linux-mod-r1 systemd toolchain-funcs DESCRIPTION="Resource-specific view of processes" HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop" @@ -26,8 +26,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-l RDEPEND=" sys-libs/ncurses:= + sys-libs/zlib >=sys-process/acct-6.6.4-r1 - modules? ( sys-libs/zlib ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -48,7 +48,7 @@ src_prepare() { if use modules ; then cd "${WORKDIR}"/${NETATOP_P} || die - eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch + eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch cd "${S}" || die fi @@ -57,31 +57,27 @@ src_prepare() { # bug #191926 sed -i 's: root : :' atop.cronsysv || die - # prefixify + # Prefixify sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die } -src_configure() { - default - - BUILD_TARGETS="netatop.ko" - MODULE_NAMES="netatop(:${NETATOP_S}/module)" -} - src_compile() { default - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install + local modlist=( "netatop=:../${NETATOP_P}/module::netatop.ko" ) + linux-mod-r1_src_compile if use modules ; then # netatop's Makefile tries to build the kernel module for us # so let's just replicate parts of it here. emake -C "${NETATOP_S}"/daemon all + fi +} +src_install() { + linux-mod-r1_src_install + + if use modules ; then dosbin "${NETATOP_S}"/daemon/netatopd doman "${NETATOP_S}"/man/* diff --git a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch new file mode 100644 index 000000000000..30710369fd46 --- /dev/null +++ b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch @@ -0,0 +1,42 @@ +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -6,7 +6,7 @@ + all: netatopd + + netatopd: netatopd.o Makefile +- $(CC) netatopd.o -o netatopd -lz ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) netatopd.o -o netatopd -lz + + clean: + rm -f *.o netatopd +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + all: + ./mkversion +- cd module; make +- cd daemon; make ++ $(MAKE) -C module ++ $(MAKE) -C daemon + + install: module/netatop.ko daemon/netatopd + install -d /lib/modules/`uname -r`/extra +@@ -14,5 +14,5 @@ + install man/netatopd.8 -t /usr/share/man/man8 + + clean: +- cd module; make clean +- cd daemon; make clean ++ $(MAKE) -C module clean ++ $(MAKE) -C daemon clean +--- a/module/Makefile ++++ b/module/Makefile +@@ -7,7 +7,7 @@ + + $(MYMODULE).ko: $(MYMODULE).c + echo start the make +- make -C $(KERNDIR) M=$(THISDIR) modules ++ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules + + clean: + rm -f *.o *.ko |