diff options
Diffstat (limited to 'classes/rootfs_deb.bbclass')
| -rw-r--r-- | classes/rootfs_deb.bbclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 2130ad6a33..bfa361c9cd 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -24,11 +24,6 @@ fakeroot rootfs_deb_do_rootfs () { continue; fi cd ${DEPLOY_DIR_DEB}/$arch - rm -f Packages.gz Packages Packages.bz2 - - # apt-native ignores Packages.bz2 unless /bin/bzip2 exists - # on the build host, so stick with gzip - dpkg-scanpackages . | gzip > Packages.gz echo "Label: $arch" > Release @@ -44,7 +39,7 @@ fakeroot rootfs_deb_do_rootfs () { cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \ - | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/lib/dpkg/status";#' \ + | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/lib/dpkg/status";#' \ | sed -e 's#DPkg::Options {".*"};#DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/lib/dpkg";"--force-all";"--no-debsig"};#' \ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" @@ -134,7 +129,7 @@ fakeroot rootfs_deb_do_rootfs () { ${ROOTFS_POSTPROCESS_COMMAND} - log_check rootfs + log_check rootfs } rootfs_deb_log_check() { @@ -143,7 +138,7 @@ rootfs_deb_log_check() { lf_txt="`cat $lf_path`" for keyword_die in "E:" - do + do if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" @@ -153,7 +148,7 @@ rootfs_deb_log_check() { do_exit=1 fi done - test "$do_exit" = 1 && exit 1 + test "$do_exit" = 1 && exit 1 true } |