diff --git a/archives/linux-bsp-nas5xx-boot-5.21-armhf.zip b/archives/linux-bsp-nas5xx-boot-5.21-armhf.zip index b066256..3c65a3c 100644 Binary files a/archives/linux-bsp-nas5xx-boot-5.21-armhf.zip and b/archives/linux-bsp-nas5xx-boot-5.21-armhf.zip differ diff --git a/archives/openmediavault-6.8.x-webif-smart.patch b/archives/openmediavault-6.8.x-webif-smart.patch new file mode 100644 index 0000000..314e27a --- /dev/null +++ b/archives/openmediavault-6.8.x-webif-smart.patch @@ -0,0 +1,15 @@ +--- a/usr/share/php/openmediavault/system/storage/smartinformation.inc 2023-09-10 21:20:24.096781279 +0200 ++++ b/usr/share/php/openmediavault/system/storage/smartinformation.inc 2023-09-10 21:33:15.078035485 +0200 +@@ -133,9 +133,9 @@ + // Bit 0: Command line did not parse + // Bit 1: Device open failed, or device did not return an + // IDENTIFY DEVICE structure +- if (($exitStatus !== 0) && (($exitStatus & 0) || ($exitStatus & 1))) { +- throw new \OMV\ExecException($cmd, $output, $exitStatus); +- } ++ //if (($exitStatus !== 0) && (($exitStatus & 0) || ($exitStatus & 1))) { ++ // throw new \OMV\ExecException($cmd, $output, $exitStatus); ++ //} + $this->cmdOutput = $output; + + // Set flag to mark information has been successfully read. diff --git a/build-debian.sh b/build-debian.sh index 20486f4..31ed75d 100755 --- a/build-debian.sh +++ b/build-debian.sh @@ -449,7 +449,8 @@ fi echo " *** install packages on build host ..." -apt-get install -y debootstrap qemu-user-static binfmt-support whiptail dosfstools rsync patch python-minimal +apt-get install -y debootstrap qemu-user-static binfmt-support whiptail dosfstools rsync patch +apt-get install -y python-minimal || apt-get install -y python2-minimal [ -e ${ltspBase}etc/${distBrandLower}-build.conf ] && . ${ltspBase}etc/${distBrandLower}-build.conf [ -e ${ltspBase}${cpuArch}/etc/${distBrandLower}-build.conf ] && . ${ltspBase}${cpuArch}/etc/${distBrandLower}-build.conf @@ -861,6 +862,10 @@ if [ "${cpuArch:0:3}" != "arm" ]; then elif [ -e ${ltspBase}${cpuArch}/bin/systemctl.druic -a -e ${ltspBase}${cpuArch}/bin/systemctl.distrib ]; then chroot ${ltspBase}${cpuArch} rm /bin/systemctl chroot ${ltspBase}${cpuArch} dpkg-divert --local --rename --remove /bin/systemctl + if [ -e ${ltspBase}${cpuArch}/bin/logger.distrib ]; then + chroot ${ltspBase}${cpuArch} rm /bin/logger + chroot ${ltspBase}${cpuArch} dpkg-divert --local --rename --remove /bin/logger + fi fi chroot ${ltspBase}${cpuArch} systemctl enable ssh @@ -1361,12 +1366,22 @@ if [ ${imageOmv} = true ]; then fi omvprfx=openmediavault-${versOmv} +omvpkgv=`chroot ${ltspBase}${cpuArch} dpkg -s openmediavault | grep -E '^Version: ' | cut -d ' ' -f 2 | cut -d '.' -f 1-2` for f in ${ltspBase}archives/*${omvprfx}*-root*.tar.gz ; do tar xzvf $f done - for f in ${ltspBase}archives/*${omvprfx}*.patch ; do + for p in ${ltspBase}archives/*${omvprfx}*.patch ; do + f=`echo $p | sed s/-${versOmv}'\..\.'/-${omvpkgv}'.'/g` + echo try $f + if [ ! -e $f ]; then + f=`echo $p | sed s/-${versOmv}'\..\.'/-${versOmv}'.0.'/g` + fi + if [ ! -e $f ]; then + f=$p + fi + echo $f s=${ltspBase}${cpuArch}/tmp/`basename $f`.done if [ ! -e $s ]; then patch -p1 < $f @@ -1445,12 +1460,22 @@ fi if [ "${cpuArch:0:3}" != "arm" ]; then true elif [ -e ${ltspBase}${cpuArch}/bin/systemctl.druic -a ! -e ${ltspBase}${cpuArch}/bin/systemctl.distrib ]; then + chroot ${ltspBase}${cpuArch} mount /proc || true + echo enable zy-stop chroot ${ltspBase}${cpuArch} systemctl enable zy-stop if [ -e ${ltspBase}${cpuArch}/lib/systemd/system/zy-fanctrl.timer ]; then + echo enable zy-fanctrl.timer chroot ${ltspBase}${cpuArch} systemctl enable zy-fanctrl.timer fi + chroot ${ltspBase}${cpuArch} umount /proc + echo divert systemctl chroot ${ltspBase}${cpuArch} dpkg-divert --local --rename --add /bin/systemctl chroot ${ltspBase}${cpuArch} ln -s /bin/systemctl.druic /bin/systemctl + if [ ! -e ${ltspBase}${cpuArch}/bin/logger.distrib ]; then + echo divert logger + chroot ${ltspBase}${cpuArch} dpkg-divert --local --rename --add /bin/logger + chroot ${ltspBase}${cpuArch} ln -s /bin/true /bin/logger + fi fi diff --git a/dru-omv.txt b/dru-omv.txt index fb9a2d2..4f13ce7 100644 --- a/dru-omv.txt +++ b/dru-omv.txt @@ -158,6 +158,8 @@ if [ "x$n" = "xsystemctl" ]; then if [ -e "/etc/init.d/${d}" ]; then /usr/sbin/update-rc.d ${d} remove fi + elif [ "x$1" = "x--version" ]; then + $0.distrib $1 fi elif [ "x$n" = "xrunlevel" ]; then if [ -e /tmp/.dru-boot.done ]; then