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

e2fsprogs: update to e2fsprogs-1.43.4, rework host build, ship full compile_et

Browse Source
This commit is contained in:
MilhouseVH 2017-06-22 18:46:42 +01:00
parent bf8b0fc4b9
commit 496ea19056
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/devel/heimdal/package.mk
View File

@ -47,6 +47,6 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
--disable-heimdal-documentation" --disable-heimdal-documentation"
makeinstall_host() { makeinstall_host() {
mkdir -p $ROOT/$TOOLCHAIN/bin mkdir -p $TOOLCHAIN/bin
cp -PR lib/asn1/asn1_compile $ROOT/$TOOLCHAIN/bin cp -PR lib/asn1/asn1_compile $TOOLCHAIN/bin
} }

8
packages/network/samba/package.mk
View File

@ -53,7 +53,7 @@ PKG_CONFIGURE_OPTS="--prefix=/usr \
--with-configdir=/run/samba \ --with-configdir=/run/samba \
--with-libiconv=$SYSROOT_PREFIX/usr \ --with-libiconv=$SYSROOT_PREFIX/usr \
--cross-compile \ --cross-compile \
--cross-answers=$ROOT/$PKG_BUILD/cache.txt \ --cross-answers=$PKG_BUILD/cache.txt \
--hostcc=gcc \ --hostcc=gcc \
--enable-fhs \ --enable-fhs \
--without-dmapi \ --without-dmapi \
@ -97,7 +97,7 @@ PKG_SAMBA_TARGET="smbclient"
pre_configure_target() { pre_configure_target() {
# samba uses its own build directory # samba uses its own build directory
cd $ROOT/$PKG_BUILD cd $PKG_BUILD
rm -rf .$TARGET_NAME rm -rf .$TARGET_NAME
# samba fails to build with gold support # samba fails to build with gold support
strip_gold strip_gold
@ -112,8 +112,8 @@ pre_configure_target() {
} }
configure_target() { configure_target() {
cp $PKG_DIR/config/samba4-cache.txt $ROOT/$PKG_BUILD/cache.txt cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt
echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $ROOT/$PKG_BUILD/cache.txt echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt
PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python-config" \ PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python-config" \
python_LDFLAGS="" python_LIBDIR="" \ python_LDFLAGS="" python_LIBDIR="" \

19
packages/sysutils/e2fsprogs/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="e2fsprogs" PKG_NAME="e2fsprogs"
PKG_VERSION="1.43.3" PKG_VERSION="1.43.4"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_SITE="http://e2fsprogs.sourceforge.net/"
@ -35,9 +35,9 @@ if [ "$HFSTOOLS" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
fi fi
PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
--bindir=/bin \ --bindir=$TOOLCHAIN/bin \
--sbindir=/sbin" --sbindir=$TOOLCHAIN/sbin"
PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \ PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
--enable-verbose-makecmds \ --enable-verbose-makecmds \
@ -73,6 +73,8 @@ pre_make_host() {
} }
post_makeinstall_target() { post_makeinstall_target() {
make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install
rm -rf $INSTALL/usr/sbin/badblocks rm -rf $INSTALL/usr/sbin/badblocks
rm -rf $INSTALL/usr/sbin/blkid rm -rf $INSTALL/usr/sbin/blkid
rm -rf $INSTALL/usr/sbin/dumpe2fs rm -rf $INSTALL/usr/sbin/dumpe2fs
@ -108,12 +110,7 @@ make_host() {
} }
makeinstall_host() { makeinstall_host() {
make -C lib/et LIBMODE=644 DESTDIR=$(pwd)/.install install make -C lib/et LIBMODE=644 install
make -C lib/ext2fs LIBMODE=644 DESTDIR=$(pwd)/.install install make -C lib/ext2fs LIBMODE=644 install
rm -fr $(pwd)/.install/bin
rm -fr $(pwd)/.install/usr/share
cp -fPa $(pwd)/.install/usr/* $TOOLCHAIN
} }