From 9ad3fbe8151066d21682354eda1cefc4f811889a Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Thu, 25 Apr 2019 21:11:14 +0200
Subject: [PATCH] scripts, tools: drop amlpkg building

---
 Makefile                       |   6 ---
 scripts/image                  |  83 ++-------------------------------
 scripts/image_st               |  83 ++-------------------------------
 tools/signapk/signapk.jar      | Bin 8986 -> 0 bytes
 tools/signapk/testkey.pk8      | Bin 1217 -> 0 bytes
 tools/signapk/testkey.x509.pem |  27 -----------
 6 files changed, 6 insertions(+), 193 deletions(-)
 delete mode 100755 tools/signapk/signapk.jar
 delete mode 100644 tools/signapk/testkey.pk8
 delete mode 100644 tools/signapk/testkey.x509.pem

diff --git a/Makefile b/Makefile
index c5229b64497..8cd6ad1f2f5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,6 @@ image:
 noobs:
 	./scripts/image noobs
 
-amlpkg:
-	./scripts/image amlpkg
-
 # legacy sequential build targets
 system-st:
 	./scripts/image_st
@@ -30,9 +27,6 @@ image-st:
 noobs-st:
 	./scripts/image_st noobs
 
-amlpkg-st:
-	./scripts/image_st amlpkg
-
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 
diff --git a/scripts/image b/scripts/image
index 93bf4b27194..e38a62bdcbb 100755
--- a/scripts/image
+++ b/scripts/image
@@ -34,7 +34,6 @@ function do_mkimage() {
     TARGET_IMG="$TARGET_IMG" \
     BUILD_NAME="$IMAGE_NAME" \
     IMAGE_NAME="${1:-$IMAGE_NAME}" \
-    INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
     KERNEL_NAME="$KERNEL_NAME" \
     TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
@@ -242,7 +241,7 @@ rm -rf $FAKEROOT_SCRIPT
 # Set permissions
 chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
 
-if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
+if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "noobs" ]; then
 
   RELEASE_DIR="target/$IMAGE_NAME"
 
@@ -305,14 +304,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
   )
 
   # Create image files if requested
-  if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
-    # INSTALL_SRC_DIR can be board specific
-    if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/install" ]; then
-      INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/devices/$DEVICE/install"
-    else
-      INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
-    fi
-
+  if [[ ( "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
     UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
     UUID_STORAGE="$(uuidgen)"
 
@@ -341,76 +333,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
   # Cleanup release dir
   rm -rf $RELEASE_DIR
 
-  # Create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
-  if [ "$1" = "amlpkg" ]; then
-    echo "Creating Amlogic ZIP update package"
-
-    AML_PKG_DIR="$RELEASE_DIR/ampl-pkg"
-
-    # Create package directory
-    mkdir -p "$AML_PKG_DIR"
-
-    # Copy system and kernel images
-    mkdir -p "$AML_PKG_DIR/system"
-    cp $TARGET_IMG/$IMAGE_NAME.system $AML_PKG_DIR/system/SYSTEM
-    cp $TARGET_IMG/$IMAGE_NAME.kernel $AML_PKG_DIR/KERNEL
-
-    # Copy update-binary and updater-script
-    META_INF_DIR="$AML_PKG_DIR/META-INF/com/google/android"
-    mkdir -p "$META_INF_DIR"
-    cp $INSTALL_SRC_DIR/update-binary $META_INF_DIR
-    cp $INSTALL_SRC_DIR/updater-script $META_INF_DIR
-
-    # Copy other files if any
-    if [ -d "$INSTALL_SRC_DIR/files" ]; then
-      cp -PR $INSTALL_SRC_DIR/files/* $AML_PKG_DIR
-    fi
-
-    # Copy device tree image if any
-    if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
-      cp "$INSTALL/usr/share/bootloader/dtb.img" $AML_PKG_DIR/dtb.img
-    fi
-
-    # Create the update package
-    pushd "$AML_PKG_DIR" > /dev/null
-    zip -rq update.zip *
-
-    # Sign the update package
-    echo "Signing the update package"
-    mkdir -p sign
-    SIGNAPK_DIR="$ROOT/tools/signapk"
-    java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
-
-    # Create the auto-install package
-    echo "Creating Amlogic ZIP auto-install package"
-    pushd sign > /dev/null
-    echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml
-    echo --wipe_data >> factory_update_param.aml
-    echo --wipe_cache >> factory_update_param.aml
-    if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
-      cp $INSTALL_SRC_DIR/files/recovery.img .
-    fi
-
-    if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
-      cp $INSTALL_SRC_DIR/files/aml_autoscript .
-    fi
-
-    # Copy device tree image if any
-    if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
-      cp "$INSTALL/usr/share/bootloader/dtb.img" .
-    fi
-
-    zip -q $TARGET_IMG/$IMAGE_NAME.zip *
-
-    # Create sha256 checksum of zip
-    ( cd $TARGET_IMG
-      sha256sum ${IMAGE_NAME}.zip > ${IMAGE_NAME}.zip.sha256
-    )
-
-    popd > /dev/null
-    popd > /dev/null
-
-  elif [ "$1" = "noobs" ]; then
+  if [ "$1" = "noobs" ]; then
     echo "Creating \"$1\" release tarball..."
 
     RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
diff --git a/scripts/image_st b/scripts/image_st
index c2275176e1b..60989ecfa7e 100755
--- a/scripts/image_st
+++ b/scripts/image_st
@@ -37,7 +37,6 @@ function do_mkimage() {
     TARGET_IMG="$TARGET_IMG" \
     BUILD_NAME="$IMAGE_NAME" \
     IMAGE_NAME="${1:-$IMAGE_NAME}" \
-    INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
     BOOTLOADER="$BOOTLOADER" \
     KERNEL_NAME="$KERNEL_NAME" \
     TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
@@ -292,7 +291,7 @@ rm -rf $FAKEROOT_SCRIPT
 # set permissions
 chmod 0644 $TARGET_IMG/$IMAGE_NAME.system
 
-if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]; then
+if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "noobs" ]; then
 
   RELEASE_DIR="target/$IMAGE_NAME"
 
@@ -355,14 +354,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
   )
 
   # create image files if requested
-  if [[ ( "$1" = "amlpkg" || "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
-    # INSTALL_SRC_DIR can be board specific
-    if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/install" ]; then
-      INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/devices/$DEVICE/install"
-    else
-      INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
-    fi
-
+  if [[ ( "$1" = "noobs" || "$1" = "mkimage" ) && -n "$BOOTLOADER" ]]; then
     UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
     UUID_STORAGE="$(uuidgen)"
 
@@ -391,76 +383,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
   # cleanup release dir
   rm -rf $RELEASE_DIR
 
-  # create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
-  if [ "$1" = "amlpkg" ]; then
-    echo "Creating Amlogic ZIP update package"
-
-    AML_PKG_DIR="$RELEASE_DIR/ampl-pkg"
-
-    # create package directory
-    mkdir -p "$AML_PKG_DIR"
-
-    # copy system and kernel images
-    mkdir -p "$AML_PKG_DIR/system"
-    cp $TARGET_IMG/$IMAGE_NAME.system $AML_PKG_DIR/system/SYSTEM
-    cp $TARGET_IMG/$IMAGE_NAME.kernel $AML_PKG_DIR/KERNEL
-
-    # copy update-binary and updater-script
-    META_INF_DIR="$AML_PKG_DIR/META-INF/com/google/android"
-    mkdir -p "$META_INF_DIR"
-    cp $INSTALL_SRC_DIR/update-binary $META_INF_DIR
-    cp $INSTALL_SRC_DIR/updater-script $META_INF_DIR
-
-    # copy other files if any
-    if [ -d "$INSTALL_SRC_DIR/files" ]; then
-      cp -PR $INSTALL_SRC_DIR/files/* $AML_PKG_DIR
-    fi
-
-    # copy device tree image if any
-    if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
-      cp "$INSTALL/usr/share/bootloader/dtb.img" $AML_PKG_DIR/dtb.img
-    fi
-
-    # create the update package
-    pushd "$AML_PKG_DIR" > /dev/null
-    zip -rq update.zip *
-
-    # sign the update package
-    echo "Signing the update package"
-    mkdir -p sign
-    SIGNAPK_DIR="$ROOT/tools/signapk"
-    java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
-
-    # create the auto-install package
-    echo "Creating Amlogic ZIP auto-install package"
-    pushd sign > /dev/null
-    echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml
-    echo --wipe_data >> factory_update_param.aml
-    echo --wipe_cache >> factory_update_param.aml
-    if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
-      cp $INSTALL_SRC_DIR/files/recovery.img .
-    fi
-
-    if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
-      cp $INSTALL_SRC_DIR/files/aml_autoscript .
-    fi
-
-    # copy device tree image if any
-    if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
-      cp "$INSTALL/usr/share/bootloader/dtb.img" .
-    fi
-
-    zip -q $TARGET_IMG/$IMAGE_NAME.zip *
-
-    # create sha256 checksum of zip
-    ( cd $TARGET_IMG
-      sha256sum ${IMAGE_NAME}.zip > ${IMAGE_NAME}.zip.sha256
-    )
-
-    popd > /dev/null
-    popd > /dev/null
-
-  elif [ "$1" = "noobs" ]; then
+  if [ "$1" = "noobs" ]; then
     echo "Creating \"$1\" release tarball..."
 
     RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
diff --git a/tools/signapk/signapk.jar b/tools/signapk/signapk.jar
deleted file mode 100755
index b050dd4dc5a9d86667ec25f75df3fa3bb34d7c64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8986
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
IfAjJG0NBQbi2wiq

diff --git a/tools/signapk/testkey.pk8 b/tools/signapk/testkey.pk8
deleted file mode 100644
index 586c1bd5cf96f9358f36b37ea98fef93f4d0a8e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1217
zcmV;y1U~yPf&{$+0RS)!1_>&LNQU<f0RaI800e>rr!ay9qXGc{0)hbn0M?Tk1m4CA
zB(d$sV&K`>B|bjQZ0jB3{|1bx=)9=SYtwjcrwXTR<_^0LnKfDe**<rvL+9u{OJum@
z{-V?7R`KFzs2jhsFtvEX1Vg?|au~Qq^&u68@HnAPiNd}(e~!M-kIKW^9^){{>XXo?
z!`w>qP$CUb2nRCYfR`8UY6UY{=BAYFEVJ^2prmHVdX(5ZF$p?nH!d$^62NY4Lh)D_
z-~I!E%nZ~-+HBp!xFlE^NCC4YWD`%n-k8ZKcSzgyXKGXpfmF!5$_KgPM^!Ts#A}-O
zZ{F<8j%nw}qR@_bCLokQnR0zR1pacF9hu*ot~j8w7k{H2TWbF49|8db0)hbn0FMm2
zSd@eZZOil8LF+r^ZYh5=o$?dxssvrd@O{PJN8(UP#IeNlL<!OgW+RbRJAV3b*YEHs
z-0jeqslnozk4x-D8oerZ%Oj=Mt%82tp=Ho7P8JSX^?MdHTh}Ri|FnNK3WqH`6qj||
z@web_*XS|#iosqrTCaCNRk{!KMRlTvd5$&3GqeJB<W5*Nq1tt1t@`yiq?4(?5b_hI
zSF92#92@0nm;7qddzq*FiFeXvOzWzAbvvBeOk`&oj_CbIYkuOxewA09a6}$&tCOS?
zt7b~cnEEA@KPytf`NisF?@AlW0ZHc<q7(smmIw?;qzBwbcFW$Dy-cBmdjf%h0P4V*
z7aW_FCyWQbo|i=!g;$Ywo~N}d_PUec)~HCtrwtgU=%}LFQ)p*vGrsbeyA(~D__e#O
zB1ZHqEX{Ow>arW*N_QWU=dJbtwUa9MNB6mRRfiD@u-F457<P+TYVmw+#Qi|17#@X(
zZ(j;5y}JX3pCNgxRdA<SdUbnYn*xD>0O|hs88oP`H<{-WtCyW#0(F+HjcFBTNtPVs
zqOAxo7-A$eO)H3r6sgRe?MH7gF5FJ$Tk3bck@E0NKQy`twmC#7`?TOyTgJ~$><(c=
zegFe}?aLXyS&y+x7cyW?K{hgS`ZOu%e`OsJB7tT%e$vUP84FySkKHZd#R8E)%>sde
z0Gxnk4`^q&#Rvr|X}T^DSmg_(X~iRQq<mtP<Zv*98VI`?@NjIAjPOMAB7aO}(hZ3b
z`y<kGY%fi6$cXq)M<HkHhWZr@nsfP8&SD&-+NCB>j#>*`b>&xVy7{s?@%B>l*r?UT
zWofQjN<Um3)6xQ2ziXy)IQ7KlQKP4pX99tN0Gt0$W+NLPdS;poa%B^g0i(Ie2=KV>
z+qr0%Y;#)55J7EtGjdx74aSIRNZLvuA3cfg=kcW}3-?Ohe|UTbd3%Dz{Ubm)=h@$h
z^0YwLsa02~o`+_B=3mQ)WXwP_fX>WJrp<9hszYeD7Xa?hso~qjW(SiJU+Bp}E&;YH
zGXjBtV=ArL8r`H~*_EbpVp|2xsYW66=~;8`kD4v(aiPJi8`ByM)}o1ZhZ|~p>uyzH
zw4p3uqoir?dUseWHOKf>xwmY}&%k#`MgFNpFR|mPj0O9er&4Gc#l%UD4Z+(RrHVV$
f`+<Wg9yE52+IqAFhbH|TjTC!{W#5k#^PapnkGxO<

diff --git a/tools/signapk/testkey.x509.pem b/tools/signapk/testkey.x509.pem
deleted file mode 100644
index e242d83e2bf..00000000000
--- a/tools/signapk/testkey.x509.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM
-qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4
-wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy
-4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU
-RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s
-zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw
-HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ
-AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa
-J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y
-LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe
-+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX
-31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr
-sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0=
------END CERTIFICATE-----