diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | mtkclient.install | 3 | ||||
-rw-r--r-- | scripts-and-data-files.patch | 14 | ||||
-rw-r--r-- | udev.patch | 25 |
5 files changed, 62 insertions, 10 deletions
@@ -1,11 +1,10 @@ pkgbase = mtkclient pkgdesc = Unofficial MTK reverse engineering and flash tool pkgver = 1.63 - pkgrel = 1 + pkgrel = 2 url = https://github.com/bkerler/mtkclient - install = mtkclient.install arch = any - license = GPL + license = GPL3 makedepends = python-build makedepends = python-installer makedepends = python-wheel @@ -15,13 +14,18 @@ pkgbase = mtkclient depends = python-pyusb depends = python-pyserial depends = python-pycryptodome + depends = python-pycryptodomex depends = python-colorama depends = python-mock depends = shiboken6 depends = pyside6 source = https://github.com/bkerler/mtkclient/archive/refs/tags/1.63.tar.gz + source = scripts-and-data-files.patch + source = udev.patch source = usb.patch sha256sums = ae9332e69ffee4331f11bc8a99f0f8d14073be6fbfad13b38f89fc71c0bae1ee + sha256sums = 923c6c8173ab26b77e4fe25ec8128ffbe68d50451873d86e6b7c66bcb8d8513f + sha256sums = d4b6d7967324e585f69c51257e4293f390291a9534e697eefc94568d169220bc sha256sums = 953b4111910056208b032573b0c34d886490efda06ada46f9718a70d15f891d2 pkgname = mtkclient @@ -2,23 +2,34 @@ pkgname=mtkclient pkgver=1.63 -pkgrel=1 +pkgrel=2 pkgdesc="Unofficial MTK reverse engineering and flash tool" arch=('any') url="https://github.com/bkerler/mtkclient" -license=('GPL') -depends=('libusb' 'python' 'python-pyusb' 'python-pyserial' 'python-pycryptodome' 'python-colorama' 'python-mock' 'shiboken6' 'pyside6') +license=('GPL3') +depends=('libusb' 'python' 'python-pyusb' 'python-pyserial' 'python-pycryptodome' 'python-pycryptodomex' 'python-colorama' 'python-mock' 'shiboken6' 'pyside6') makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools') -install=mtkclient.install source=("https://github.com/bkerler/mtkclient/archive/refs/tags/$pkgver.tar.gz" + "scripts-and-data-files.patch" + "udev.patch" "usb.patch") sha256sums=('ae9332e69ffee4331f11bc8a99f0f8d14073be6fbfad13b38f89fc71c0bae1ee' + '923c6c8173ab26b77e4fe25ec8128ffbe68d50451873d86e6b7c66bcb8d8513f' + 'd4b6d7967324e585f69c51257e4293f390291a9534e697eefc94568d169220bc' '953b4111910056208b032573b0c34d886490efda06ada46f9718a70d15f891d2') prepare() { cd mtkclient-$pkgver + # Remove problematic "usb" dependency (package already depends on pyusb) cat ../usb.patch | patch -p1 + + # Prevent LICENSE and README.md from being installed directly into /usr. + # Also add mtk_gui to list of scripts to be insalled into /usr/bin. + cat ../scripts-and-data-files.patch | patch -p1 + + # Replace plugdev with uaccess and adbusers like upstream android-udev + cat ../udev.patch | patch -p1 } build() { @@ -29,4 +40,5 @@ build() { package() { cd mtkclient-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl + install -Dm644 Setup/Linux/51-edl.rules "$pkgdir/usr/lib/udev/rules.d/52-mtk-edl.rules" } diff --git a/mtkclient.install b/mtkclient.install deleted file mode 100644 index 3a302d07ff7c..000000000000 --- a/mtkclient.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo -e "\033[1;32m==>\033[0m \033[1mInstall the correct udev rules with the instructions at \e[4mhttps://github.com/bkerler/mtkclient#install-rules" -} diff --git a/scripts-and-data-files.patch b/scripts-and-data-files.patch new file mode 100644 index 000000000000..26382068900a --- /dev/null +++ b/scripts-and-data-files.patch @@ -0,0 +1,14 @@ +diff --git a/setup.py b/setup.py +index 1ed20a4..9d3bc77 100755 +--- a/setup.py ++++ b/setup.py +@@ -6,8 +6,7 @@ setup( + version='1.6.3', + packages=find_packages(), + long_description=open("README.md").read(), +- scripts=['mtk','stage2'], +- data_files = ['LICENSE','README.md'], ++ scripts=['mtk','stage2', 'mtk_gui'], + long_description_content_type="text/markdown", + url='https://github.com/bkerler/mtkclient', + project_urls={ diff --git a/udev.patch b/udev.patch new file mode 100644 index 000000000000..dce3a2cf9da6 --- /dev/null +++ b/udev.patch @@ -0,0 +1,25 @@ +diff --git a/Setup/Linux/51-edl.rules b/Setup/Linux/51-edl.rules +index 95e5594..ee2f384 100755 +--- a/Setup/Linux/51-edl.rules ++++ b/Setup/Linux/51-edl.rules +@@ -1,15 +1,15 @@ + + # Qualcomm EDL +-SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666", GROUP="plugdev" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0660", GROUP="adbusers", TAG+="uaccess" + + # Qualcomm Memory Debug +-SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9006", MODE="0666", GROUP="plugdev" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9006", MODE="0660", GROUP="adbusers", TAG+="uaccess" + + # Qualcomm Memory Debug +-SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="900E", MODE="0666", GROUP="plugdev" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="900E", MODE="0660", GROUP="adbusers", TAG+="uaccess" + + # LG Memory Debug +-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1004", ATTRS{idProduct}=="61a1", MODE="0666", GROUP="plugdev" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1004", ATTRS{idProduct}=="61a1", MODE="0660", GROUP="adbusers", TAG+="uaccess" + + # Sierra Wireless +-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1199", ATTRS{idProduct}=="9071", MODE="0666", GROUP="plugdev" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1199", ATTRS{idProduct}=="9071", MODE="0660", GROUP="adbusers", TAG+="uaccess" |