From ce62112523f06f6655f673436247b4902ab0a9c3 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Fri, 1 Apr 2016 10:27:10 -0600 Subject: opkg-utils: opkg-build exit when fail to list files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have an issue when ls segfaults in some cases [1] so it's better to detect the failure at this level instead of continue the build process. [YOCTO #8926] [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8926#c0 Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- .../opkg-build-Exit-when-fail-to-list-files.patch | 45 ++++++++++++++++++++++ meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 +- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/opkg-build-Exit-when-fail-to-list-files.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/opkg-build-Exit-when-fail-to-list-files.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/opkg-build-Exit-when-fail-to-list-files.patch new file mode 100644 index 0000000000..6c66902efe --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/opkg-build-Exit-when-fail-to-list-files.patch @@ -0,0 +1,45 @@ +We have an issue when ls segfaults in some cases [1] so it's +better to detect the failure at this level instead of continue +the build process. + +[YOCTO #8926] + +Upstream-Status: Submitted [2] + +[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8926#c0 +[2] https://groups.google.com/forum/#!topic/opkg-devel/cmX02bgHZms + +Signed-off-by: Aníbal Limón +--- + opkg-build | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/opkg-build b/opkg-build +index 98008b6..a9ccad2 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -53,6 +53,10 @@ pkg_appears_sane() { + echo "*** Warning: The following files have names ending in '~'. + You probably want to remove them: " >&2 + ls -ld $tilde_files ++ if [ $? -ne 0 ]; then ++ echo "*** Error: Fail to list files have names ending in '~'." ++ exit 1 ++ fi + echo >&2 + else + echo "*** Removing the following files: $tilde_files" +@@ -66,6 +70,10 @@ You probably want to remove them: " >&2 + echo "*** Warning: The following files have a UID greater than 99. + You probably want to chown these to a system user: " >&2 + ls -ld $large_uid_files ++ if [ $? -ne 0 ]; then ++ echo "*** Error: Fail to list files have a UID greater than 99." ++ exit 1 ++ fi + echo >&2 + fi + +-- +2.1.4 + diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 1bc561c08a..22f45a1d8d 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -10,8 +10,8 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" PV = "0.1.8+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/opkg-utils" - +SRC_URI = "git://git.yoctoproject.org/opkg-utils \ + file://opkg-build-Exit-when-fail-to-list-files.patch" SRC_URI_append_class-native = " file://tar_ignore_error.patch" S = "${WORKDIR}/git" -- cgit 1.2.3-korg