update by lilac

1 files changed, 40 insertions, 60 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0202d96aa296..de7d2adca64e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: edward-p <edward At edward-p Dot xyz>
 
 pkgname=proxmark3-iceman-git
-pkgver=6915.bfec7648
+pkgver=6934.b792d0d5
 pkgrel=1
 pkgdesc=pkgdesc='RRG / Iceman repo - Proxmark3 RDV4.0 and other Proxmark3 platforms.'
 arch=('x86_64')
@@ -11,6 +11,7 @@ depends=('libusb' 'perl')
 makedepends=('git' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib')
 provides=('proxmark3' 'proxmark3-iceman')
 conflicts=('proxmark3' 'proxmark3-iceman')
+options=('!makeflags')
 replaces=($pkgname'-generic' $pkgname'-rdv4')
 source=("$pkgname::git+https://github.com/RfidResearchGroup/proxmark3.git")
 sha512sums=('SKIP')
@@ -21,76 +22,55 @@ pkgver() {
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
-prepare() {
-  export PM3_DOC_PATH="/usr/share/doc/proxmark3"
-  export PM3_SHARE_PATH="/usr/share/proxmark3"
-  export PM3_BIN_PATH="/usr/bin"
-  export UDEV_PREFIX="/usr/lib/udev/rules.d"
-}
-
 build() {
   cd "${srcdir}/${pkgname}"
-  mkdir "firmware"
-  # Build firmware and recovery for pm3rdv4
-  make PLATFORM=PM3RDV4 PLATFORM_EXTRAS=BTADDON fullimage recovery
-  mv "armsrc/obj/fullimage.elf" "firmware/fullimage-rdv4.elf"
-  mv "recovery/proxmark3_recovery.bin" "firmware/proxmark3_recovery-rdv4.bin"
 
-  make clean
+  mkdir "build"
+  
+  STANDALONE_MODES=('LF_SAMYRUN' 'LF_ICERUN' 'LF_PROXBRUTE' 'LF_HIDBRUTE' 'HF_YOUNG' 'HF_MATTYRUN')
+  RDV4_STANDALONE_MODES=('HF_COLIN' 'HF_BOG')
+ 
+  # Build recovery (without PLATFORM_EXTRAS and STANDALONE)
+  make -j DESTDIR="build" PREFIX="/usr" \
+    PLATFORM="PM3RDV4" STANDALONE= FWTAG="rdv4-nostandalone" recovery/install
+  make -j DESTDIR="build" PREFIX="/usr" \
+    PLATFORM="PM3OTHER" STANDALONE= FWTAG="other-nostandalone" recovery/install
 
-  # Build firmware and recovery for generic pm3 and other targets
-  make PLATFORM=PM3OTHER all
+  # Build various firmwares
+  for standalone in ${STANDALONE_MODES[@]}; do
 
-  mv "armsrc/obj/fullimage.elf" "firmware/fullimage-generic.elf"
-  mv "recovery/proxmark3_recovery.bin" "firmware/proxmark3_recovery-generic.bin"
+      make -j DESTDIR="build" PREFIX="/usr" \
+        PLATFORM="PM3RDV4" PLATFORM_EXTRAS="BTADDON" STANDALONE="${standalone}" \
+        FWTAG="rdv4-"$(echo ${standalone} | tr '[:upper:]' '[:lower:]') fullimage/install
 
-}
+      make -j DESTDIR="build" PREFIX="/usr" \
+        PLATFORM="PM3OTHER" STANDALONE="${standalone}" \
+        FWTAG="other-"$(echo ${standalone} | tr '[:upper:]' '[:lower:]') fullimage/install
 
-package() {
-  cd "${srcdir}/${pkgname}"
-  
-  # Install firmwares
-  mv "tools/simmodule/SIM011.sha512.txt" "firmware/"
-  mv "tools/simmodule/SIM011.BIN" "firmware/"
-  mv "bootrom/obj/bootrom.elf" "firmware/"
-  for file in $(ls firmware); do
-    install -Dm 644 "firmware/$file" "${pkgdir}/$PM3_SHARE_PATH/firmware/$file"
   done
 
-  # Install executables
-  install -Dm 755 "client/proxmark3" "${pkgdir}/$PM3_BIN_PATH/proxmark3"
-  #install -Dm 755 "proxmark3.sh" "${pkgdir}/$PM3_BIN_PATH/p3"
-  install -Dm 755 "client/flasher" "${pkgdir}/$PM3_BIN_PATH/proxmark3-flasher"
-  #install -Dm 755 "flash-all.sh" "${pkgdir}/$PM3_BIN_PATH/pm3-flash-all"
-  #install -Dm 755 "flash-bootrom.sh" "${pkgdir}/$PM3_BIN_PATH/pm3-flash-bootrom"
-  #install -Dm 755 "flash-fullimage.sh" "${pkgdir}/$PM3_BIN_PATH/pm3-flash-fullimage"
+  for standalone in ${RDV4_STANDALONE_MODES[@]}; do
 
-  # Install tools
-  install -Dm 755 "tools/mfkey/mfkey32" "${pkgdir}/$PM3_SHARE_PATH/tools/mfkey32"
-  install -Dm 755 "tools/mfkey/mfkey32v2" "${pkgdir}/$PM3_SHARE_PATH/tools/mfkey32v2"
-  install -Dm 755 "tools/mfkey/mfkey64" "${pkgdir}/$PM3_SHARE_PATH/tools/mfkey64"
-  install -Dm 755 "tools/nonce2key/nonce2key" "${pkgdir}/$PM3_SHARE_PATH/tools/nonce2key"
-  install -Dm 755 "client/pm3_eml2lower.sh" "${pkgdir}/$PM3_SHARE_PATH/tools/pm3_eml2lower.sh"
-  install -Dm 755 "client/pm3_eml2upper.sh" "${pkgdir}/$PM3_SHARE_PATH/tools/pm3_eml2upper.sh"
-  install -Dm 755 "client/pm3_mfdread.py" "${pkgdir}/$PM3_SHARE_PATH/tools/pm3_mfdread.py"
-  install -Dm 755 "client/pm3_mfd2eml.py" "${pkgdir}/$PM3_SHARE_PATH/tools/pm3_mfd2eml.py"
-  install -Dm 755 "client/pm3_eml2mfd.py" "${pkgdir}/$PM3_SHARE_PATH/tools/pm3_eml2mfd.py"
-  install -Dm 755 "tools/findbits.py" "${pkgdir}/$PM3_SHARE_PATH/tools/findbits.py"
-  install -Dm 755 "tools/rfidtest.pl" "${pkgdir}/$PM3_SHARE_PATH/tools/rfidtest.pl"
-  install -Dm 755 "tools/xorcheck.py" "${pkgdir}/$PM3_SHARE_PATH/tools/xorcheck.py"
-  cp -a "tools/jtag_openocd" "${pkgdir}/$PM3_SHARE_PATH/"
-  
-  # Install udev rules
-  install -Dm 644 "driver/77-pm3-usb-device-blacklist.rules" "${pkgdir}/$UDEV_PREFIX/77-pm3-usb-device-blacklist.rules"
+      make -j DESTDIR="build" PREFIX="/usr" \
+        PLATFORM="PM3RDV4" PLATFORM_EXTRAS="BTADDON" STANDALONE="${standalone}" \
+        FWTAG="rdv4-"$(echo ${standalone} | tr '[:upper:]' '[:lower:]') fullimage/install
+
+  done
+
+  make clean
+  # Build other targets
+  make -j1 DESTDIR="build" PREFIX="/usr" \
+    PLATFORM="PM3RDV4" PLATFORM_EXTRAS="BTADDON" STANDALONE="${standalone}" \
+    FWTAG="rdv4-"$(echo ${standalone} | tr '[:upper:]' '[:lower:]') install
 
-  # Install others
-  cp -a "client/lualibs" "${pkgdir}/$PM3_SHARE_PATH/"
-  cp -a "client/luascripts" "${pkgdir}/$PM3_SHARE_PATH/"
+  # Don't need this recovery
+  make -j DESTDIR="build" PREFIX="/usr" \
+    PLATFORM="PM3RDV4" PLATFORM_EXTRAS="BTADDON" STANDALONE="${standalone}" \
+    FWTAG="rdv4-"$(echo ${standalone} | tr '[:upper:]' '[:lower:]') recovery/uninstall
 
-  cp -a "client/resources" "${pkgdir}/$PM3_SHARE_PATH/"
+}
 
-  cp -a "traces" "${pkgdir}/$PM3_SHARE_PATH/"
-  install -dm 755 "${pkgdir}/$PM3_DOC_PATH"
-  cp -a doc/* "${pkgdir}/$PM3_DOC_PATH/"
-  cp -a "client/dictionaries" "${pkgdir}/$PM3_SHARE_PATH/"
+package() {
+  cd "${srcdir}/${pkgname}"
+  mv build/* "${pkgdir}/"
 }