build: don't wipe devel files from packages, just don't install them

With the upcoming usage of the standard install_pkg folder for addon
dependencies, the devel files need to be accessible, e.g. ffmpegx for
tvheadend.

So don't wipe them from the package install folder, just skip copying
them to the image.
This commit is contained in:
Andre Heider 2019-12-12 09:05:15 +01:00
parent 629ca9dd61
commit 912a91619b
2 changed files with 16 additions and 8 deletions

View File

@ -445,24 +445,17 @@ export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}"
if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then
if [ -d ${INSTALL} ]; then if [ -d ${INSTALL} ]; then
rm -rf ${INSTALL}/{usr/,}include
rm -rf ${INSTALL}/{usr/,}lib/cmake
rm -rf ${INSTALL}/{usr/,}lib/pkgconfig
rm -rf ${INSTALL}/{usr/,}man rm -rf ${INSTALL}/{usr/,}man
rm -rf ${INSTALL}/{usr/,}share/aclocal
rm -rf ${INSTALL}/{usr/,}share/bash-completion rm -rf ${INSTALL}/{usr/,}share/bash-completion
rm -rf ${INSTALL}/{usr/,}share/doc rm -rf ${INSTALL}/{usr/,}share/doc
rm -rf ${INSTALL}/{usr/,}share/gtk-doc rm -rf ${INSTALL}/{usr/,}share/gtk-doc
rm -rf ${INSTALL}/{usr/,}share/info rm -rf ${INSTALL}/{usr/,}share/info
rm -rf ${INSTALL}/{usr/,}share/locale rm -rf ${INSTALL}/{usr/,}share/locale
rm -rf ${INSTALL}/{usr/,}share/man rm -rf ${INSTALL}/{usr/,}share/man
rm -rf ${INSTALL}/{usr/,}share/pkgconfig
rm -rf ${INSTALL}/{usr/,}share/zsh rm -rf ${INSTALL}/{usr/,}share/zsh
rm -rf ${INSTALL}/{usr/,}var rm -rf ${INSTALL}/{usr/,}var
find ${INSTALL} \( -name "*.orig" \ find ${INSTALL} \( -name "*.orig" \
-o -name "*.rej" \ -o -name "*.rej" \
-o -name "*.a" \
-o -name "*.la" \
-o -name "*.o" \ -o -name "*.o" \
-o -name "*.in" \ -o -name "*.in" \
-o -name ".git*" \) \ -o -name ".git*" \) \

View File

@ -138,7 +138,22 @@ if [ "${TARGET}" = "target" ] ; then
fi fi
if [ -n "${PKG_INSTALL}" -a -d "${PKG_INSTALL}" ]; then if [ -n "${PKG_INSTALL}" -a -d "${PKG_INSTALL}" ]; then
cp -PR ${PKG_INSTALL}/* ${INSTALL} tar \
-C "${PKG_INSTALL}" \
--exclude=./usr/include \
--exclude=./usr/lib/cmake \
--exclude=./usr/lib/pkgconfig \
--exclude=./usr/share/aclocal \
--exclude=./usr/share/pkgconfig \
--exclude=./include \
--exclude=./lib/cmake \
--exclude=./lib/pkgconfig \
--exclude=./share/aclocal \
--exclude=./share/pkgconfig \
--exclude=./.* \
--exclude='*.a' \
--exclude='*.la' \
-cf - . | tar -C "${INSTALL}" -xf -
fi fi
if [ "${TARGET}" = "target" ] ; then if [ "${TARGET}" = "target" ] ; then