diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2006-11-13 19:10:05 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2006-11-13 19:10:05 +0000 |
| commit | f7171587f09b13c97cc73109cd9eaf7c5aa78e47 (patch) | |
| tree | b5946293f56e4dee2d643c5c411ed77405f4001f /classes/rootfs_ipk.bbclass | |
| parent | 38d9e8aff1967820b22faeea83610c3c359f7705 (diff) | |
| parent | 40951de5f883d7a2d9d5445a9b73c3424ee245f1 (diff) | |
merge of '119a1b8e3787f193a0a34391450debc2878897c4'
and '4f36e4b6e145cb3251f372bb7153308459b7ea41'
Diffstat (limited to 'classes/rootfs_ipk.bbclass')
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8cea393b43..c4b2991874 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -11,9 +11,9 @@ RDEPENDS += "ipkg ipkg-collateral" PACKAGES = "" -do_rootfs[nostamp] = 1 -do_rootfs[dirs] = ${TOPDIR} -do_build[nostamp] = 1 +do_rootfs[nostamp] = "1" +do_rootfs[dirs] = "${TOPDIR}" +do_build[nostamp] = "1" IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" @@ -98,7 +98,7 @@ log_check() { for keyword_die in "Cannot find package" "exit 1" ERR Fail do - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null + 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" echo -e "log_check: Matched keyword: [$keyword_die]\n" |