diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-12-12 18:29:24 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-12 18:29:45 -0500 |
| commit | f048dceea57aa5850370d8c95b3a49bd6696d901 (patch) | |
| tree | 8490954f3aadc52ffd7e3c5dd185a70b32586c42 | |
| parent | sys-apps/memtest+: fix building w/gcc-5 #548312 (diff) | |
| download | gentoo-f048dceea57aa5850370d8c95b3a49bd6696d901.tar.gz gentoo-f048dceea57aa5850370d8c95b3a49bd6696d901.tar.bz2 gentoo-f048dceea57aa5850370d8c95b3a49bd6696d901.zip | |
sys-apps/memtest+: switch scp disable to a patch
This uses the Fedora one so it's a bit more clear we're on the same page.
| -rw-r--r-- | sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch | 12 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-5.01-r1.ebuild | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch new file mode 100644 index 000000000000..8303ccf4229c --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch @@ -0,0 +1,12 @@ +this makes no sense in a sane build world + +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,6 @@ + + + all: clean memtest.bin memtest +- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild index aa4a848888c7..f18f5b0fb70b 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild @@ -24,9 +24,9 @@ DEPEND="" src_prepare() { sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -e "s/scp memtest.bin root@192.168.0.12:\/srv\/tftp\/mt86plus//g" -i Makefile epatch "${FILESDIR}/${P}-gcc-473.patch" \ "${FILESDIR}/${P}-hardcoded_cc.patch" + epatch "${FILESDIR}"/${P}-no-scp.patch epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 |