jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4191 from HiassofT/le10-fix-obj-remove

Browse Source 
allow packages to install *.o files into the image
This commit is contained in:
MilhouseVH 2020-02-13 17:26:09 +00:00 committed by GitHub
commit 70b69ebffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/functions
View File

@ -133,17 +133,17 @@ build_msg() {
# prints a warning if the file slated for removal doesn't exist # prints a warning if the file slated for removal doesn't exist
# this allows us to continue instead of bailing out with just "rm" # this allows us to continue instead of bailing out with just "rm"
safe_remove() { safe_remove() {
local path="$1" local path
[ -z "${path}" ] && return 0 for path in "$@" ; do
if [ -e "${path}" -o -L "${path}" ]; then
if [ -e "${path}" -o -L "${path}" ]; then rm -r "${path}"
rm -r "${path}" elif [ -n "${PKG_NAME}" ]; then
elif [ -n "${PKG_NAME}" ]; then print_color CLR_WARNING "safe_remove: path does not exist: [${PKG_NAME}]: ${path}\n"
print_color CLR_WARNING "safe_remove: path does not exist: [${PKG_NAME}]: ${path}\n" else
else print_color CLR_WARNING "safe_remove: path does not exist: ${path}\n"
print_color CLR_WARNING "safe_remove: path does not exist: ${path}\n" fi
fi done
} }
### BUILDSYSTEM HELPERS ### ### BUILDSYSTEM HELPERS ###

2
packages/lang/Python3/package.mk
View File

@ -130,6 +130,8 @@ post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/python*-config rm -rf $INSTALL/usr/bin/python*-config
rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.* rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.*
find $INSTALL -name '*.o' -delete
python_compile $PKG_INSTALL_PATH_LIB python_compile $PKG_INSTALL_PATH_LIB
# strip # strip

1
scripts/build
View File

@ -482,7 +482,6 @@ if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then
rm -rf ${INSTALL}/{usr/local/,usr/,}var rm -rf ${INSTALL}/{usr/local/,usr/,}var
find ${INSTALL} \( -name "*.orig" \ find ${INSTALL} \( -name "*.orig" \
-o -name "*.rej" \ -o -name "*.rej" \
-o -name "*.o" \
-o -name "*.in" \ -o -name "*.in" \
-o -name ".git*" \) \ -o -name ".git*" \) \
-exec rm -f {} \; 2>/dev/null || : -exec rm -f {} \; 2>/dev/null || :