[gentoo-commits] repo/gentoo:master commit in: net-wireless/hackrf-tools/, net-wireless/hackrf-tools/files/

[Rick Farina]

commit:     c4b3c6c06cfd14130ab9422f1ae4417b87c3f49c
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 21:26:32 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 21:26:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b3c6c0

net-wireless/hackrf-tools: add support for mayhem

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../files/{hackrf_easy_flash => hackrf_easy_flash-r1}             | 8 ++++++++
 ...tools-2018.01.1-r1.ebuild => hackrf-tools-2018.01.1-r2.ebuild} | 2 +-
 net-wireless/hackrf-tools/hackrf-tools-9999.ebuild                | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net-wireless/hackrf-tools/files/hackrf_easy_flash 
b/net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
similarity index 94%
rename from net-wireless/hackrf-tools/files/hackrf_easy_flash
rename to net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
index 78d0c69b0cd..deece5e3189 100644
--- a/net-wireless/hackrf-tools/files/hackrf_easy_flash
+++ b/net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
@@ -50,6 +50,9 @@ list_firmware() {
   if [ -r "/usr/share/hackrf/portapack-h1-havoc.bin" ]; then
     printf "portapack-havoc (--havoc)\n"
   fi
+  if [ -r "/usr/share/hackrf/portapack-h1_h2-mayhem.bin" ]; then
+    printf "portapack-mayhem (--mayhem)\n"
+  fi
 }
 
 #parse args
@@ -78,6 +81,11 @@ while [ -n "${1}" ]; do
       TARGET=havoc
       shift
       ;;
+    mayhem|--mayhem)
+      firmware="/usr/share/hackrf/portapack-h1_h2-mayhem.bin"
+      TARGET=mayhem
+      shift
+      ;;
     cpld|--cpld)
       CPLD=1
       get_cpld

diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild 
b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
similarity index 96%
rename from net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
rename to net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
index 85077b67001..bc7430341b0 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 
 src_install() {
        cmake_src_install
-       dosbin "${FILESDIR}/hackrf_easy_flash"
+       newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
        if [[ ${PV} != "9999" ]] ; then
                insinto /usr/share/hackrf
                newins 
"${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" 
hackrf_jawbreaker_usb-${PV}.bin

diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild 
b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
index d7c23f08076..db45e737e6b 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 
 src_install() {
        cmake_src_install
-       dosbin "${FILESDIR}/hackrf_easy_flash"
+       newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
        if [[ ${PV} != "9999" ]] ; then
                insinto /usr/share/hackrf
                newins 
"${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" 
hackrf_jawbreaker_usb-${PV}.bin