Files Entware-ng_20260821_arm_008/control.tar.gz and Entware-ng_20260829_arm_007/control.tar.gz differ --- Entware-ng_20260821_arm_008/control/ReplaceRule +++ Entware-ng_20260829_arm_007/control/ReplaceRule @@ -18,7 +18,7 @@ # ============================================================================ PKG_NAME="Entware-ng" THIS_SCRIPT="ReplaceRule" -PKG_VERSION="20260821zypkg008" +PKG_VERSION="20260829zypkg007" ############################################################# ## Extract the PKG_ROOT for this package --- Entware-ng_20260821_arm_008/control/control +++ Entware-ng_20260829_arm_007/control/control @@ -1,5 +1,5 @@ Package: Entware-ng -Version: 20260821zypkg008 +Version: 20260829zypkg007 Description: Entware-ng is a software repository for embedded devices like routers or network attached storages. Depends: Size: 38400 @@ -7,4 +7,4 @@ Architecture: arm Zy-Model: all IsBuiltin: N -Filename: Entware-ng_20260821_arm_008.zpkg +Filename: Entware-ng_20260829_arm_007.zpkg --- Entware-ng_20260821_arm_008/control/postinst +++ Entware-ng_20260829_arm_007/control/postinst @@ -18,7 +18,7 @@ # ============================================================================ PKG_NAME="Entware-ng" THIS_SCRIPT="postinst" -PKG_VERSION="20260821zypkg008" +PKG_VERSION="20260829zypkg007" PKG_FIRMWARE=4 ############################################################ @@ -137,7 +137,8 @@ ExchangeDownloadUrl() { local LASTURL="/tmp/.MetaRepository/tmp/lasturl" - if [ -f ${LASTURL} && ! -s ${LASTURL} ] ; then + if [ -f && ! -s ] ; then + if [ -f /tmp/.MetaRepository/tmp/lasturl ] ; then local url=$(cat /tmp/.MetaRepository/tmp/lasturl ) sed -i "s|^PKG_DOWNLOAD_URL=http://zyxel.ddnss.eu/Users/Mijzelf/zypkg-repo/fw5|PKG_DOWNLOAD_URL=${url}|" ${PKG_ROOT}/etc/init.d/${PKG_NAME} fi --- Entware-ng_20260821_arm_008/control/postrm +++ Entware-ng_20260829_arm_007/control/postrm @@ -18,7 +18,7 @@ # ============================================================================ PKG_NAME="Entware-ng" THIS_SCRIPT="postrm" -PKG_VERSION="20260821zypkg008" +PKG_VERSION="20260829zypkg007" PKG_FIRMWARE=4 ############################################################ --- Entware-ng_20260821_arm_008/control/preinst +++ Entware-ng_20260829_arm_007/control/preinst @@ -18,7 +18,7 @@ # ============================================================================ PKG_NAME="Entware-ng" THIS_SCRIPT="preinst" -PKG_VERSION="20260821zypkg008" +PKG_VERSION="20260829zypkg007" PKG_FIRMWARE=4 ############################################################ --- Entware-ng_20260821_arm_008/control/prerm +++ Entware-ng_20260829_arm_007/control/prerm @@ -18,7 +18,7 @@ # ============================================================================ PKG_NAME="Entware-ng" THIS_SCRIPT="prerm" -PKG_VERSION="20260821zypkg008" +PKG_VERSION="20260829zypkg007" PKG_FIRMWARE=4 ############################################################ Files Entware-ng_20260821_arm_008/data.tar.gz and Entware-ng_20260829_arm_007/data.tar.gz differ --- Entware-ng_20260821_arm_008/data/gui/Entware-ng/RELEASENOTES +++ Entware-ng_20260829_arm_007/data/gui/Entware-ng/RELEASENOTES @@ -1,10 +1,7 @@ -20260821zypkg008 -* Automatic update to Entware for armv7 devices during package Installation -* GUI improvements - -20260816zypkg007 +20260829zypkg007 20260829-stick * Updated links to repository server -* GUI improvements +* Automatic update to Entware for armv7 devices during package Installation +* GUI improvements (not for stick) 20160216-stick * Added a 'wait for disks to be mounted' option --- Entware-ng_20260821_arm_008/data/gui/Entware-ng/pkgcgi.cgi +++ Entware-ng_20260829_arm_007/data/gui/Entware-ng/pkgcgi.cgi @@ -47,6 +47,7 @@ Chapter_Intro() { local title="Entware${ENTWARE_SUFFIX} ${ARCH}" + if [ $1 -eq 0 ] ; then cat >&1 <<__END__

${title}

@@ -93,7 +94,7 @@ cat >&1 <<__END__

${title}

-To use Entware${ENTWARE_SUFFIX} you need shell access. You'll need to enable a telnet or ssh service on the NAS for that. +To use Entware${ENTWARE_SUFFIX} you need shell access. You'll need to enable a telnet or ssh service on the NAS for that.

Firmware 5.10

You can do that on the desktop, in 'Control panel->Network->Terminal'.

Firmware 4.80

@@ -101,8 +102,8 @@

Older

You can use the 3th party package 'Tweaks' to enable the telnet service, or Dropbear to get an ssh server. -(You can even install Anyterm, which will give you a shell in a brows -

If you plan to install the Entware${ENTWARE_SUFFIX} ssh server, you can choose to use the Anyterm, which will give you a shell in a brows +

If you plan to install the Entware${ENTWARE_SUFFIX} ssh server, you can choose to use the Telnet Backdoor to get one-off access.

Client side

@@ -155,8 +156,7 @@ [ -f /opt/sbin/kernel-2.6.24-support.sh ] || return local title="Old kernel support" - -if [ $1 -eq 0 ] ; then + if [ $1 -eq 0 ] ; then cat >&1 <<__END__

${title}

__END__ @@ -194,7 +194,7 @@ Chapter_FFP() { - local title="Entware${ENTWARE_SUFFIX} & FFP coexisting" + local title=" Entware${ENTWARE_SUFFIX} & FFP coexisting" if [ $1 -eq 0 ] ; then cat >&1 <<__END__

${title}

@@ -204,20 +204,20 @@ cat >&1 <<__END__

${title}

-FFP and Entware${ENTWARE_SUFFIX} are both designed to exist next to the firmware, without interfering. A side effect is that they can coexist fine. But there are some small problems. +FFP and Entware${ENTWARE_SUFFIX} are both designed to exist next to the firmware, without interfering. A side effect is that they can coexist fine. But there are some small problems. It's all in the PATH. When you type a command, the shell searches it's PATH to find it, and execute it. You can examine your PATH by typing
echo \$PATH
Normally, it contains something like '/usr/bin:/usr/sbin:/bin:/sbin'. This means the shell will first look in /usr/bin for your command, then in /usr/sbin, then in /bin, ...
-Entware${ENTWARE_SUFFIX} puts itself in the PATH by prefixing it with '/opt/bin:/opt/sbin:', while FFP prefixes it with '/ffp/bin:/ffp/sbin:', but the way they do this is different.

+ Entware${ENTWARE_SUFFIX} puts itself in the PATH by prefixing it with '/opt/bin:/opt/sbin:', while FFP prefixes it with '/ffp/bin:/ffp/sbin:', but the way they do this is different.

When logging in, your shell is read from /etc/passwd. By default this is /bin/sh. This shell executes /etc/profile to set it's environment. -Entware${ENTWARE_SUFFIX} hooks this by making /etc/profile to source /opt/etc/profile, which adds the Entware directories to the PATH.

+ Entware${ENTWARE_SUFFIX} hooks this by making /etc/profile to source /opt/etc/profile, which adds the Entware directories to the PATH.

The FFP package exchanges the default shell in /etc/passwd by it's own shell, /ffp/bin/sh, which doesn't use /etc/profile, but /ffp/etc/profile, which appends the FFP path.

-So if you have both FFP and Entware${ENTWARE_SUFFIX} installed, your PATH will by default not include the Entware${ENTWARE_SUFFIX} directories, as you are running an FFP shell, which doesn't use /etc/profile, +So if you have both FFP and Entware${ENTWARE_SUFFIX} installed, your PATH will by default not include the Entware${ENTWARE_SUFFIX} directories, as you are running an FFP shell, which doesn't use /etc/profile, and so doesn't use /opt/etc/profile either.

-This problem can be solved by providing the full path when you want to execute an Entware${ENTWARE_SUFFIX} command:
/opt/bin/some_command
-or you can source /opt/etc/profile:
. /opt/etc/profile
The latter has the problem that Entware${ENTWARE_SUFFIX} will put it's directories in front of the FFP directories, -which means the Entware${ENTWARE_SUFFIX} binaries will be prefered above the FFP one's. (Which can be solved by providing the full path of the desired FFP binaries) +This problem can be solved by providing the full path when you want to execute an Entware${ENTWARE_SUFFIX} command:
/opt/bin/some_command
+or you can source /opt/etc/profile:
. /opt/etc/profile
The latter has the problem that Entware${ENTWARE_SUFFIX} will put it's directories in front of the FFP directories, +which means the Entware${ENTWARE_SUFFIX} binaries will be prefered above the FFP one's. (Which can be solved by providing the full path of the desired FFP binaries) __END__ # ' } @@ -236,7 +236,7 @@

${title}

Redirecting

If you copy the contents of ${PKG_ROOT}/opt/ to an USB stick (or SD card) and create an (executable) script ${PKG_ROOT}/opt/redirect.sh which outputs the new root, -Entware${ENTWARE_SUFFIX} will run from that new root.
+ Entware${ENTWARE_SUFFIX} will run from that new root.
Example, copy to stick:
# cp -a ${PKG_ROOT}/opt /e-data/f8f5f38463c16267000c311ac176a098/
The redirect script could be:
#!/bin/sh
 
 echo /e-data/f8f5f38463c16267000c311ac176a098/opt
But as it is a script, you can also use blkid or something like that to find the mountpoint. If the returned value is not a directory, it's ignored. @@ -294,7 +294,7 @@ cat >&1 <<__EOF__

${title}

-The changelog of Entware${ENTWARE_SUFFIX} itself can be found here. +The changelog of Entware${ENTWARE_SUFFIX} itself can be found here. __EOF__ [ -f ${PKG_ROOT}/gui/${PKG_NAME}/RELEASENOTES ] || return cat >&1 <<__EOF__ @@ -321,7 +321,7 @@ DownloadLogfile ${logfile} return fi - + ARCH=` awk -F'\/' '/armv[57]$/ {print $NF}' /opt/etc/opkg.conf ) ` ENTWARE_URL=` grep -v "^#" /opt/etc/opkg.conf | grep packages | awk '{print $3}' ` [ ENTWARE_URL="" ] && ENTWARE_URL=` grep -v "^#" /opt/etc/opkg.conf | grep entware | awk '{print $3}' `