diff options
| author | Bertrand Jacquin <beber@meleeweb.net> | 2014-04-04 20:38:02 +0200 |
|---|---|---|
| committer | Bertrand Jacquin <beber@meleeweb.net> | 2014-04-04 20:40:21 +0200 |
| commit | 082e8cdd89969be4d39d43c16b402c9f66b1f75d (patch) | |
| tree | c61dd24b93eb3011e5ea48aa534453b62914d644 /app-admin | |
| parent | sys-kernel/stable-sources: Version bump (diff) | |
| download | portage-082e8cdd89969be4d39d43c16b402c9f66b1f75d.tar.xz | |
app-admin/hp-health: Patch init script to make it handle compressed kernel modules
Package-Manager: portage-2.2.10
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/hp-health/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/hp-health/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/hp-health/files/9.50-initd-module-comp.patch | 38 | ||||
| -rw-r--r-- | app-admin/hp-health/hp-health-9.50.ebuild | 12 |
4 files changed, 58 insertions, 2 deletions
diff --git a/app-admin/hp-health/ChangeLog b/app-admin/hp-health/ChangeLog index f542123e..624d8a14 100644 --- a/app-admin/hp-health/ChangeLog +++ b/app-admin/hp-health/ChangeLog @@ -1,3 +1,8 @@ + 04 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> + +files/9.50-initd-module-comp.patch, hp-health-9.50.ebuild: + app-admin/hp-health: Patch init script to make it handle compressed kernel + modules + 04 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> hp-health-9.50.ebuild: app-admin/hp-health: Move to multilib-minimal for hpasmd diff --git a/app-admin/hp-health/Manifest b/app-admin/hp-health/Manifest index c6041f57..b4867a5b 100644 --- a/app-admin/hp-health/Manifest +++ b/app-admin/hp-health/Manifest @@ -1,5 +1,6 @@ +AUX 9.50-initd-module-comp.patch 1080 SHA256 c8f64f82ee9bd498076740c416fbde1cf588a60c4e89c1559e74b16322d8295e WHIRLPOOL fbfbd6ad5fae08869f838bb1a4c555a2694446808b06baa538d3bf5b55a0f4889a5b2fd451f7ff0ea1914d871bf73689826cff13aee2b45841094cdce269d79b DIST hp-health-9.50-1628.32.rhel6.x86_64.rpm 328532 SHA256 8dc1247dded64d620d72b02384997d3e6bf582233fa766ee9bd35c7ef17ecaed WHIRLPOOL a14ab562e22fbbdb3415ec595151001559e8ddf43f90d93bfd90eda40ace80a299b56622226199120192036db9d506174fa1bc2ede544e28f1cdf79b18e73de8 DIST hp-health-9.50-1628.33.rhel6.i686.rpm 408816 SHA256 7ee31c9843e5e8b06d42143c5b5f167fef5c62e5f22b759bd2da7caf84ce48ca WHIRLPOOL 7207ba5af89b211b06e505f5334607c20792d8fac844c33e018bbf12054096612f9c60232a7629acf951b780fa2c19e457e5e6a410b1bf277c1b7d0449439ef3 -EBUILD hp-health-9.50.ebuild 1982 SHA256 4375b5a33db142d2bd437988c838cd1c584eab8bbdc46094955dd17c0769e531 WHIRLPOOL cdfb9642f476e085a30a5224465477f8753be6c9bedfbca20f9e80a812d25f0121c6a0b258e4ee0bdec797bd831d33bb7add94e2e07a55dee3a41587ea371eb8 -MISC ChangeLog 514 SHA256 568a0244c73ad3dc68e23f178b7abc553c7922f8ede5606b7dcb97b38a47bb5e WHIRLPOOL bc23b7c063c5007fa2c44a56cd93a4d9d0eb593df10d2ef202e8fb0c9642ca9277f6adae98e405195d6a8482f8708c30665d85af4090e41b0b818430757db83f +EBUILD hp-health-9.50.ebuild 2202 SHA256 9bee69a33f446537992b3ac6e2a8890764bb4e2dcfb5e851ca9b7266c7fbc340 WHIRLPOOL 453a2a12b8e75e11e0da2780016175aeb0693584d27c0bf9d0b9f2a0a20ae2c72e7feffdd59b4b1bb2f464146e50a2d7d0695aa20298197cfd75559bf9942a17 +MISC ChangeLog 717 SHA256 06918ab5c7d14c5ef70cf1bef515be030030b05ae82a64bb75d54cd648d601b2 WHIRLPOOL eae3d7c575ad5531204d42de6eaa67c02459173631f399c7e6c9bf00a24b8d3d46f5bd7e3ad30d0ae42892d4cfb5d697bfbba35005a0418ce7816feb16bf0484 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/app-admin/hp-health/files/9.50-initd-module-comp.patch b/app-admin/hp-health/files/9.50-initd-module-comp.patch new file mode 100644 index 00000000..8e2c9c77 --- /dev/null +++ b/app-admin/hp-health/files/9.50-initd-module-comp.patch @@ -0,0 +1,38 @@ +--- /etc/init.d/hp-health 2014-04-04 19:59:06.147784628 +0200 ++++ /etc/init.d/hp-health 2014-04-04 20:35:19.101941522 +0200 +@@ -209,7 +209,12 @@ + if have_hp_ipmi; then + echo "$HPOPENIPMI_ROOT/bin/${KVER}/$module" + else +- echo "/lib/modules/${KVER}/kernel/drivers/char/ipmi/$module" ++ for ext in "" .gz .xz ; do ++ if [ -f "/lib/modules/${KVER}/kernel/drivers/char/ipmi/${module}${ext}" ] ; then ++ echo "/lib/modules/${KVER}/kernel/drivers/char/ipmi/${module}${ext}" ++ break ++ fi ++ done + fi + } + +@@ -344,7 +349,20 @@ + } + + supports_pci_probe() { +- nm $(module_path) | grep -q ipmi_pci_probe ++ local o_ko="$(module_path)" ++ local t_ko="$(mktemp)" ++ ++ case "${o_ko}" in ++ *.ko.xz) xzcat "${o_ko}" > "${t_ko}" ;; ++ *.ko.gz) zcat "${o_ko}" > "${t_ko}" ;; ++ *.ko) cat "${o_ko}" > "${t_ko}" ;; ++ esac ++ ++ nm "${t_ko}" | grep -q ipmi_pci_probe ++ ret=$? ++ ++ rm "${t_ko}" ++ return ${ret} + } + + ## Scan the system for an iLO device. Return one of the following: diff --git a/app-admin/hp-health/hp-health-9.50.ebuild b/app-admin/hp-health/hp-health-9.50.ebuild index 11d0c186..1f222a63 100644 --- a/app-admin/hp-health/hp-health-9.50.ebuild +++ b/app-admin/hp-health/hp-health-9.50.ebuild @@ -51,6 +51,18 @@ src_unpack() { fi } +src_prepare() { + if use abi_x86_32 ; then + cd "${x86_S}" + epatch "${FILESDIR}/${PV}-initd-module-comp.patch" + fi + + if use abi_x86_64 ; then + cd "${amd64_S}" + epatch "${FILESDIR}/${PV}-initd-module-comp.patch" + fi +} + # Fake for nicer output multilib-minimal_src_configure() { :; } multilib-minimal_src_compile() { :; } |