CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

opkg-utils: re-do find/ls code to not fail on filenames with spaces

Browse Source 
(From OE-Core rev: e3e305135d258bee3ae30a2c7262b886d710b986)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Denys Dmytriyenko 2016-04-08 00:57:08 -04:00 committed by Richard Purdie
parent 5e360ca135
commit d366a3319e
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch Normal file
View File

@ -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

3
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
View File

@ -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"