moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

busybox: clean up template.

Browse source 
Revert CONFIG_PIE, it has nothing to do with the bug in #12300.
Clean up -static logic.
Don't run defconfig to just replace the .config in the next step.

Revbump to actually rebuild.
This commit is contained in:
Leah Neukirchen 2018-03-09 14:54:00 +01:00
parent dc0aed489e
commit 77d34157c3
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/busybox/files/busybox.dotconfig
View file

@ -40,7 +40,7 @@ CONFIG_PLATFORM_LINUX=y
# Build Options # Build Options
# #
# CONFIG_STATIC is not set # CONFIG_STATIC is not set
CONFIG_PIE=y # CONFIG_PIE is not set
# CONFIG_NOMMU is not set # CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set

31
srcpkgs/busybox/template
View file

@ -1,7 +1,7 @@
# Build template for 'busybox'. # Build template for 'busybox'.
pkgname=busybox pkgname=busybox
version=1.28.1 version=1.28.1
revision=1 revision=2
hostmakedepends="perl" hostmakedepends="perl"
checkdepends="zip" checkdepends="zip"
short_desc="The Swiss Army Knife of Embedded Linux" short_desc="The Swiss Army Knife of Embedded Linux"
@ -26,15 +26,8 @@ do_configure() {
local t local t
for t in busybox busybox-static; do for t in busybox busybox-static; do
mkdir -p $t mkdir -p $t
make -C $t KBUILD_SRC=${wrksrc}/src -f ${wrksrc}/src/Makefile defconfig
cp -f ${FILESDIR}/${t}.dotconfig ${t}/.config cp -f ${FILESDIR}/${t}.dotconfig ${t}/.config
if [ "$t" = busybox-static ]; then
sed -e '/CONFIG_STATIC/ s/.*/CONFIG_STATIC=y/' \
-e '/CONFIG_PIE/ s/.*/# CONFIG_PIE is not set/' \
-i "$t"/.config
fi
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \ *-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
-e /CONFIG_FEATURE_MOUNT_NFS/s/y/n/ \ -e /CONFIG_FEATURE_MOUNT_NFS/s/y/n/ \
@ -42,24 +35,22 @@ do_configure() {
esac esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
sed -e \ sed -i -e \
"s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \ "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \
-i ${t}/.config ${t}/.config
fi fi
make -C $t prepare ${makejobs} make -C $t KBUILD_SRC=${wrksrc}/src -f ${wrksrc}/src/Makefile prepare ${makejobs}
done done
sed -i -e '/CONFIG_STATIC/ s/.*/CONFIG_STATIC=y/' busybox-static/.config
if [ "$SOURCE_DATE_EPOCH" ]; then if [ "$SOURCE_DATE_EPOCH" ]; then
# rewrite date with the one from the date wrapper. # rewrite date with the one from the date wrapper.
d=$(date +"%F %T %Z") d=$(date +"%F %T %Z")
sed -i "s/\(#define AUTOCONF_TIMESTAMP\).*/\1 \"$d\"/" */include/autoconf.h sed -i "s/\(#define AUTOCONF_TIMESTAMP\).*/\1 \"$d\"/" */include/autoconf.h
fi fi
} }
do_build() { do_build() {
local t make -C busybox SKIP_STRIP=y ${makejobs}
for t in busybox busybox-static; do make -C busybox-static SKIP_STRIP=y ${makejobs}
make -C $t SKIP_STRIP=y ${makejobs}
done
} }
do_check() { do_check() {
# Copy the testsuite into the busybox and it's static counterpart # Copy the testsuite into the busybox and it's static counterpart
@ -72,14 +63,16 @@ do_check() {
cp src/scripts/echo.c busybox-static/scripts cp src/scripts/echo.c busybox-static/scripts
# Run testsuite for busybox # Run testsuite for busybox
(
cd busybox/testsuite cd busybox/testsuite
SKIP_KNOWN_BUGS=yes ./runtest -v SKIP_KNOWN_BUGS=yes ./runtest -v
)
cd ../../ # Run testsuite for busybox-static
(
# run testsuite for busybox-static
cd busybox-static/testsuite cd busybox-static/testsuite
SKIP_KNOWN_BUGS=yes ./runtest -v SKIP_KNOWN_BUGS=yes ./runtest -v
)
} }
do_install() { do_install() {
vbin busybox/busybox_unstripped busybox vbin busybox/busybox_unstripped busybox