scripts/ipkg-build: quash error messages when conffiles.resolved is empty
authorYousong Zhou <yszhou4tech@gmail.com>
Thu, 6 Sep 2018 08:00:24 +0000 (08:00 +0000)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 10:28:12 +0000 (11:28 +0100)
When Package/xx/conffiles only contains directories that are empty at
package time, conffiles.resolved will be missing and the following
error messages will appear in the build log.

/home/yousong/git-repo/openwrt/openwrt/scripts/ipkg-build -c -o 0 -g 0 /home/yousong/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/linux-malta_be/openvswitch-2.10.0/ipkg-mips_24kc/openvswitch-common /home/yousong/git-repo/openwrt/openwrt/bin/packages/mips_24kc/packages
mv: cannot stat 'CONTROL/conffiles.resolved': No such file or directory
chmod: cannot access 'CONTROL/conffiles': No such file or directory

It will not break the ipkg-build process.  The change is merely cosmetic
to not cause confusion when reading logs

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(backported from 9e58c20ec9d48ee41a4a306b0cd6d3aece285efd)

scripts/ipkg-build

index d38ba20af30cee4b0843c64b40f5f101e218d411..21127f33910cabb82f6b025a1865f305c88b9c10 100755 (executable)
@@ -64,8 +64,10 @@ pkg_appears_sane() {
                done
 
                rm $CONTROL/conffiles
-               mv $CONTROL/conffiles.resolved $CONTROL/conffiles
-               chmod 0644 $CONTROL/conffiles
+               if [ -f $CONTROL/conffiles.resolved ]; then
+                       mv $CONTROL/conffiles.resolved $CONTROL/conffiles
+                       chmod 0644 $CONTROL/conffiles
+               fi
        fi
 
        cd $owd