pygos
/
build
mirror of https://github.com/pygos/build.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove dev deploy split 

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-06-17 13:28:18 +02:00
parent 90b2586ea4
commit 3d30afef75
43 changed files with 24 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk.sh
View File

@ -37,13 +37,12 @@ TCDIR="$BUILDROOT/${BOARD}-${PRODUCT}/toolchain"
PKGBUILDDIR="$BUILDROOT/${BOARD}-${PRODUCT}/build"
PKGSRCDIR="$BUILDROOT/src"
PKGDEPLOYDIR="$BUILDROOT/${BOARD}-${PRODUCT}/deploy"
PKGDEVDEPLOYDIR="$BUILDROOT/${BOARD}-${PRODUCT}/deploy-dev"
PKGLOGDIR="$BUILDROOT/${BOARD}-${PRODUCT}/log"
PKGDOWNLOADDIR="$BUILDROOT/download"
PACKAGELIST="$BUILDROOT/${BOARD}-${PRODUCT}/pkglist"
mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
mkdir -p "$PKGDEPLOYDIR" "$PKGDEVDEPLOYDIR" "$TCDIR/bin"
mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin"
export PATH="$TCDIR/bin:$PATH"
@ -89,6 +88,7 @@ while read pkg; do
install_build_deps
run_pkg_command "build"
run_pkg_command "deploy"
deploy_dev_cleanup "$PKGDEPLOYDIR/$PKGNAME"
restore_toolchain
rm -rf "$PKGBUILDDIR"

3
pkg/bash-completion/build
View File

@ -18,12 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/bash/build
View File

@ -19,7 +19,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
@ -29,8 +28,6 @@ deploy() {
cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY"
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

2
pkg/bdb/build
View File

@ -19,7 +19,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
@ -28,7 +27,6 @@ deploy() {
strip_files ${DEPLOY}/lib/*.so ${DEPLOY}/bin/db_*
rm -r "$DEPLOY/docs"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

2
pkg/btrfs-progs/build
View File

@ -22,14 +22,12 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
strip_files ${DEPLOY}/{bin,lib}/*
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/bzip2/build
View File

@ -18,7 +18,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make PREFIX="$DEPLOY" install
@ -31,8 +30,6 @@ deploy() {
ln -s "/bin/bzmore" "$DEPLOY/bin/bzless"
ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp"
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

1
pkg/dnsmasq/build
View File

@ -18,7 +18,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make CC=${TARGET}-gcc PREFIX="/" BINDIR="/bin" DESTDIR="$DEPLOY" install

1
pkg/dosfstools/build
View File

@ -19,7 +19,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"

2
pkg/eudev/build
View File

@ -24,11 +24,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
rmdir "$DEPLOY/share"
}

3
pkg/expat/build
View File

@ -19,13 +19,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/file/build
View File

@ -18,13 +18,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

11
pkg/firmware-rpi3/build
View File

@ -16,17 +16,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
cp -r "$SOURCE/hardfp/opt" "$DEPLOY/"
mkdir -p "$DEVDEPLOY/opt/vc"
mv "$DEPLOY/opt/vc/include" "$DEVDEPLOY"
cp -r "$DEPLOY/opt/vc/lib" "$DEVDEPLOY/opt/vc"
rm ${DEPLOY}/opt/vc/lib/*.a
rm -r "${DEPLOY}/opt/vc/lib/pkgconfig"
rm -r "${DEPLOY}/opt/vc/src"
cp -r "$SOURCE/hardfp/opt" "$DEPLOY"
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
strip_files ${DEPLOY}/opt/vc/{bin,sbin}/*

2
pkg/gmp/build
View File

@ -18,12 +18,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
unfuck_libtool
make DESTDIR="$DEPLOY" install
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/lib/*.so*
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
}

1
pkg/iproute2/build
View File

@ -18,7 +18,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
mkdir -p "$DEPLOY/var/lib/arpd"
make DESTDIR="$DEPLOY" SYSROOT="$TCDIR/$TARGET" install

3
pkg/kbd/build
View File

@ -19,12 +19,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/kmod/build
View File

@ -19,7 +19,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
local target
make DESTDIR="$DEPLOY" install-strip
@ -28,8 +27,6 @@ deploy() {
for target in depmod insmod lsmod modinfo modprobe rmmod; do
ln -sf kmod $DEPLOY/bin/$target
done
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/libbsd/build
View File

@ -18,12 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

5
pkg/libiconv/build
View File

@ -18,14 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
rm -r "$DEPLOY/share"
rm "$DEPLOY/lib/charset.alias"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/{bin,lib}/*
}

5
pkg/libidn2/build
View File

@ -18,13 +18,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
rm -r "$DEPLOY/share"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/libmnl/build
View File

@ -18,12 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/libnftnl/build
View File

@ -18,12 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

5
pkg/libseccomp/build
View File

@ -18,13 +18,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
rm -r "$DEPLOY/share"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

5
pkg/libtasn1/build
View File

@ -18,13 +18,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
rm -r "$DEPLOY/share"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

6
pkg/libunistring/build
View File

@ -18,14 +18,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
rm -r "$DEPLOY/share"
rm "$DEPLOY/lib/charset.alias"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

3
pkg/linux_headers/build
View File

@ -10,8 +10,7 @@ build() {
deploy() {
local INPUT="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
export KBUILD_OUTPUT="$PKGBUILDDIR"
make -C "$INPUT" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$DEVDEPLOY" headers_install
make -C "$INPUT" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$DEPLOY" headers_install
}

3
pkg/lzo/build
View File

@ -19,12 +19,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

11
pkg/musl/build
View File

@ -17,14 +17,9 @@ build() {
deploy() {
local INPUT="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
DESTDIR="$DEVDEPLOY" make install-headers
DESTDIR="$DEVDEPLOY" make install-libs
rm $DEVDEPLOY/lib/*.so*
DESTDIR="$DEPLOY" make install-headers
DESTDIR="$DEPLOY" make install-libs
rm $DEPLOY/lib/*.a $DEPLOY/lib/*.o
mkdir -p "$DEPLOY/etc"
@ -32,9 +27,9 @@ deploy() {
strip_files ${DEPLOY}/lib/*
find "$DEPLOY/lib" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
find ${DEPLOY}/lib/*.so* -exec stat {} --printf="%n m %a 0 0\\n" \; | \
sed "s#^$DEPLOY/##g" | sed "s/644/444/g" | \
sed "s/755/555/g" | tail -n +2 > "$DEPLOY/rootfs_files.txt"
sed "s/755/555/g" > "$DEPLOY/rootfs_files.txt"
find "$DEPLOY/etc" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
sed "s#^$DEPLOY/##g" | tail -n +2 >> "$DEPLOY/rootfs_files.txt"

37
pkg/ncurses/build
View File

@ -21,7 +21,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
@ -30,44 +29,20 @@ deploy() {
strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
mkdir -p "${DEPLOY}/include/ncurses"
mkdir -p "${DEVDEPLOY}/include/ncurses"
for hdr in ${DEVDEPLOY}/include/ncursesw/*.h; do
for hdr in ${DEPLOY}/include/ncursesw/*.h; do
local fname=$(basename $hdr)
local target="../$fname"
mv "$hdr" "${DEVDEPLOY}/include"
ln -s "$target" "${DEVDEPLOY}/include/ncursesw/${fname}"
ln -s "$target" "${DEVDEPLOY}/include/ncurses/${fname}"
mv "$hdr" "${DEPLOY}/include"
ln -s "$target" "${DEPLOY}/include/ncursesw/${fname}"
ln -s "$target" "${DEPLOY}/include/ncurses/${fname}"
done
ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so"
ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so.$VERSION"
ln -s "libncursesw.a" "$DEVDEPLOY/lib/libtinfo.a"
# only keep relevant terminfo files
local olddir="$DEPLOY/share/terminfo.old"
local newdir="$DEPLOY/share/terminfo"
local term x
mv "$newdir" "$olddir"
for term in ansi dumb gnome gnome-fc5 gnome-rh72 gnome-rh80 \
gnome-rh90 gnome-256color klone+color konsole \
konsole-256color kvt linux linux-m linux-nic mlterm \
nxterm rxvt rxvt-256color rxvt-basic rxvt-color screen \
screen-256color screen-w unknown vt100 vt102 vt220 \
vt220-8 vt220-8bit vt320 vt52 vte xterm xterm-256color \
xterm-basic xterm-color xterm-nic xterm-r6;
do
x=${term:0:1}
mkdir -p "$newdir/$x"
mv "$olddir/$x/$term" "$newdir/$x"
done
rm -r "$olddir"
ln -s "libncursesw.a" "$DEPLOY/lib/libtinfo.a"
}
check_update() {

2
pkg/nettle/build
View File

@ -18,11 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/{bin,lib}/*
}

1
pkg/nftables/build
View File

@ -19,7 +19,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"

2
pkg/openssl/build
View File

@ -21,12 +21,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
}

3
pkg/procps-ng/build
View File

@ -22,12 +22,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

1
pkg/psmisc/build
View File

@ -21,7 +21,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"

2
pkg/readline/build
View File

@ -18,12 +18,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
chmod 755 ${DEPLOY}/lib/*
strip_files ${DEPLOY}/lib/*
}

5
pkg/sqlite3/build
View File

@ -18,13 +18,8 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
rm -r "$DEPLOY/share"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

13
pkg/tc-gcc2/build
View File

@ -20,7 +20,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make install
@ -28,7 +27,7 @@ deploy() {
for f in $(ls ${TCDIR}/${TARGET}/include); do
for dep in $DEPENDS; do
if [ -e ${PKGDEVDEPLOYDIR}/${dep}/include/$f ]; then
if [ -e ${PKGDEPLOYDIR}/${dep}/include/$f ]; then
rm -rf "$TCDIR/$TARGET/include/$f"
fi
done
@ -36,10 +35,6 @@ deploy() {
for f in $(ls ${TCDIR}/${TARGET}/lib); do
for dep in $DEPENDS; do
if [ -e ${PKGDEVDEPLOYDIR}/${dep}/lib/$f ]; then
rm -rf "$TCDIR/$TARGET/lib/$f"
continue
fi
if [ -e ${PKGDEPLOYDIR}/${dep}/lib/$f ]; then
rm -rf "$TCDIR/$TARGET/lib/$f"
fi
@ -47,10 +42,8 @@ deploy() {
done
mkdir -p "$DEPLOY/lib"
mv ${TCDIR}/${TARGET}/{include,lib} "$DEVDEPLOY"
rm ${DEVDEPLOY}/lib/*.la
mv ${DEVDEPLOY}/lib/*.so* "$DEPLOY/lib"
mv ${DEPLOY}/lib/*.py "$DEVDEPLOY/lib"
mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY"
rm ${DEPLOY}/lib/*.la
strip_files ${DEPLOY}/lib/*
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"

2
pkg/unbound/build
View File

@ -21,7 +21,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
local tag alg type digest
make DESTDIR="$DEPLOY" install
@ -29,7 +28,6 @@ deploy() {
cat_file_override "unbound.conf" > "$DEPLOY/etc/unbound/unbound.conf"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/{bin,lib}/*
echo "generating trust anchor root.key"

2
pkg/util-linux/build
View File

@ -32,7 +32,6 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
local UTIL
mkdir -p "$DEPLOY/var/lib/hwclock"
@ -45,7 +44,6 @@ deploy() {
mv ${DEPLOY}/sbin/* ${DEPLOY}/bin
fi
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
}

3
pkg/xz/build
View File

@ -18,12 +18,9 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install-strip
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
}
check_update() {

2
pkg/zlib/build
View File

@ -19,12 +19,10 @@ build() {
deploy() {
local SOURCE="$1"
local DEPLOY="$2"
local DEVDEPLOY="$3"
make DESTDIR="$DEPLOY" install
cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
strip_files ${DEPLOY}/lib/*
}

31
util/misc.sh
View File

@ -22,38 +22,17 @@ strip_files() {
done
}
split_dev_deploy() {
local lib f
if [ -d "$1/include" ]; then
mv "$1/include" "$2"
fi
if [ -d "$1/lib/pkgconfig" ]; then
mkdir -p "$2/lib/pkgconfig"
mv $1/lib/pkgconfig/* "$2/lib/pkgconfig"
rmdir "$1/lib/pkgconfig"
fi
deploy_dev_cleanup() {
local f
if [ -d "$1/share/pkgconfig" ]; then
mkdir -p "$2/lib/pkgconfig"
mv $1/share/pkgconfig/* "$2/lib/pkgconfig"
mkdir -p "$1/lib/pkgconfig"
mv $1/share/pkgconfig/* "$1/lib/pkgconfig"
rmdir "$1/share/pkgconfig"
fi
for f in ${1}/lib/*.la; do
if [ -e "$f" ]; then
rm "$f"
fi
done
for f in ${1}/lib/*.a; do
if [ -f "$f" ]; then
mkdir -p "$2/lib"
mv ${1}/lib/*.a "$2/lib"
fi
break
[ ! -e "$f" ] || rm "$f"
done
}

6
util/pkgcmd.sh
View File

@ -1,18 +1,16 @@
run_pkg_command() {
local FUNCTION="$1"
local DEPLOYDIR="$PKGDEPLOYDIR/$PKGNAME"
local DEVDEPLOYDIR="$PKGDEVDEPLOYDIR/$PKGNAME"
local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log"
local SRC="$PKGSRCDIR/$SRCDIR"
echo "$PKGNAME - $FUNCTION"
mkdir -p "$PKGBUILDDIR" "$DEPLOYDIR" "$DEVDEPLOYDIR"
mkdir -p "$PKGBUILDDIR" "$DEPLOYDIR"
pushd "$PKGBUILDDIR" > /dev/null
$FUNCTION "$SRC" "$DEPLOYDIR" "$DEVDEPLOYDIR" &>> "$LOGFILE" < /dev/null
$FUNCTION "$SRC" "$DEPLOYDIR" &>> "$LOGFILE" < /dev/null
popd > /dev/null
(rmdir "$DEPLOYDIR" || true) 2> /dev/null ;
(rmdir "$DEVDEPLOYDIR" || true) 2> /dev/null ;
}

5
util/toolchain.sh
View File

@ -17,14 +17,11 @@ restore_toolchain() {
install_build_deps() {
for deppkg in $DEPENDS; do
local devdir="$PKGDEVDEPLOYDIR/$deppkg"
local devdir="$PKGDEPLOYDIR/$deppkg"
if [ -d "$devdir/include" ]; then
cp -R "$devdir/include" "$TCDIR/$TARGET"
fi
if [ -d "$PKGDEPLOYDIR/$deppkg/lib" ]; then
cp -R "$PKGDEPLOYDIR/$deppkg/lib" "$TCDIR/$TARGET"
fi
if [ -d "$devdir/lib" ]; then
cp -R "$devdir/lib" "$TCDIR/$TARGET"
fi