diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2016-04-08 00:57:08 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-08 07:55:15 +0100 |
| commit | e3e305135d258bee3ae30a2c7262b886d710b986 (patch) | |
| tree | 59fa68f5a9090bd64c5887e54cc51edd4c4b993a | |
| parent | dd1db8a578979a16d993a73b6f8a5720f2849932 (diff) | |
| download | openembedded-core-e3e305135d258bee3ae30a2c7262b886d710b986.tar.gz openembedded-core-e3e305135d258bee3ae30a2c7262b886d710b986.tar.bz2 openembedded-core-e3e305135d258bee3ae30a2c7262b886d710b986.zip | |
opkg-utils: re-do find/ls code to not fail on filenames with spaces
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch | 56 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 3 |
2 files changed, 58 insertions, 1 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch new file mode 100644 index 0000000000..5cbb55a7dc --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch @@ -0,0 +1,56 @@ +From 8e424296ce2af4a5a7392c38a31f8723f9b9fbda Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Thu, 7 Apr 2016 20:43:13 -0400 +Subject: [PATCH] opkg-build: re-do find/ls code to not fail on filenames with + spaces + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + opkg-build | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/opkg-build b/opkg-build +index a9ccad2..07305b2 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -6,7 +6,6 @@ + # 2003-04-25 rea@sr.unh.edu + # Updated to work on Familiar Pre0.7rc1, with busybox tar. + # Note it Requires: binutils-ar (since the busybox ar can't create) +-# For UID debugging it needs a better "find". + set -e + + version=1.0 +@@ -47,12 +46,12 @@ pkg_appears_sane() { + + PKG_ERROR=0 + +- tilde_files=`find . -name '*~'` ++ tilde_files=`find . -name '*~' -ls -printf '\\\n'` + if [ -n "$tilde_files" ]; then + if [ "$noclean" = "1" ]; then + echo "*** Warning: The following files have names ending in '~'. + You probably want to remove them: " >&2 +- ls -ld $tilde_files ++ echo -e $tilde_files + if [ $? -ne 0 ]; then + echo "*** Error: Fail to list files have names ending in '~'." + exit 1 +@@ -64,12 +63,12 @@ You probably want to remove them: " >&2 + fi + fi + +- large_uid_files=`find . -uid +99 || true` ++ large_uid_files=`find . -uid +99 -ls -printf '\\\n' || true` + + if [ "$ogargs" = "" ] && [ -n "$large_uid_files" ]; then + 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 ++ echo -e $large_uid_files + if [ $? -ne 0 ]; then + echo "*** Error: Fail to list files have a UID greater than 99." + exit 1 +-- +2.2.0 + diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 22f45a1d8d..8873b28701 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -11,7 +11,8 @@ SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" PV = "0.1.8+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/opkg-utils \ - file://opkg-build-Exit-when-fail-to-list-files.patch" + file://opkg-build-Exit-when-fail-to-list-files.patch \ + file://0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch" SRC_URI_append_class-native = " file://tar_ignore_error.patch" S = "${WORKDIR}/git" |