From c4b66e57f0c5fa844de7ba3e6c01d9fcb79b16ce Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Tue, 22 Jan 2019 00:03:05 +0100 Subject: [PATCH 1/5] Added armv5 support --- wdpk/entware/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wdpk/entware/install.sh b/wdpk/entware/install.sh index eb87ad9..345f0c1 100755 --- a/wdpk/entware/install.sh +++ b/wdpk/entware/install.sh @@ -22,6 +22,8 @@ mount --bind ${OPT_ROOT} /opt 2>&1 | tee -a $LOG ARCH="$(uname -m)" if [ ${ARCH} = "x86_64" ]; then ENT_ARCH="x64" +elif [ ${ARCH} = "armv5tel" ]; then + ENT_ARCH="armv5sf" else ENT_ARCH="armv7sf" fi From 588647c3442e991a9facab1e529451ce6bce2408 Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Tue, 22 Jan 2019 00:04:12 +0100 Subject: [PATCH 2/5] Remove all apps on entware upgrade --- wdpk/entware/remove.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wdpk/entware/remove.sh b/wdpk/entware/remove.sh index 288e72d..12047c0 100755 --- a/wdpk/entware/remove.sh +++ b/wdpk/entware/remove.sh @@ -7,8 +7,8 @@ path=$1 # remove /opt from shell path rm -f /etc/profile -# uncomment this to remove all your entware apps -#rm -rf /shares/Volume_1/entware +# comment this to prevent removing all your entware apps +rm -rf /shares/Volume_1/entware # remove init.d startup hook From 02c126cf2fea4dab0c7ca5057292a13574b46c64 Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Tue, 22 Jan 2019 00:04:29 +0100 Subject: [PATCH 3/5] Bump version --- wdpk/entware/apkg.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdpk/entware/apkg.rc b/wdpk/entware/apkg.rc index 16e1f2d..7e7b17f 100644 --- a/wdpk/entware/apkg.rc +++ b/wdpk/entware/apkg.rc @@ -1,5 +1,5 @@ Package: entware -Version: 1.04 +Version: 1.05 Packager: TFL Email: Homepage: https://github.com/Entware/Entware From 0416d69458387787fdade3b925b55d0494e59d52 Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Wed, 23 Jan 2019 09:31:19 +0100 Subject: [PATCH 4/5] Invalidate old entware root directories --- wdpk/entware/preinst.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wdpk/entware/preinst.sh b/wdpk/entware/preinst.sh index 806a3db..377db26 100755 --- a/wdpk/entware/preinst.sh +++ b/wdpk/entware/preinst.sh @@ -1,6 +1,11 @@ #!/bin/sh -[ -f /tmp/debug_apkg ] && echo "APKG_DEBUG: $0 $@" >> /tmp/debug_apkg +[[ -f /tmp/debug_apkg ]] && echo "APKG_DEBUG: $0 $@" >> /tmp/debug_apkg APKG_PATH=$1 +# invalidate old entware installation leftovers +# restore them if necessary +ENTWARE_ROOT=/shares/Volume_1/entware +BACKUP=${ENTWARE_ROOT}.bak +[[ -d ${ENTWARE_ROOT} ]] && mv ${ENTWARE_ROOT} ${BACKUP} From 7178f6b8061580e7df276cdfa5e3068ba72f405f Mon Sep 17 00:00:00 2001 From: Stefaan Ghysels Date: Wed, 23 Jan 2019 09:32:37 +0100 Subject: [PATCH 5/5] Use current Entware name --- wdpk/entware/apkg.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdpk/entware/apkg.rc b/wdpk/entware/apkg.rc index 7e7b17f..8bd8f3f 100644 --- a/wdpk/entware/apkg.rc +++ b/wdpk/entware/apkg.rc @@ -5,7 +5,7 @@ Email: Homepage: https://github.com/Entware/Entware Description: Ultimate repo for embedded devices Icon: entware.png -AddonShowName: Entware-ng +AddonShowName: Entware AddonIndexPage: AddonUsedPort: InstDepend: