busybox: fix '/dev/nul'*
!= /dev/null
issue.
cf. http://lists.busybox.net/pipermail/busybox/2018-March/086295.html
This commit is contained in:
parent
7f41b80116
commit
9422c8f238
2 changed files with 9 additions and 13 deletions
|
@ -40,7 +40,7 @@ CONFIG_PLATFORM_LINUX=y
|
||||||
# Build Options
|
# Build Options
|
||||||
#
|
#
|
||||||
# CONFIG_STATIC is not set
|
# CONFIG_STATIC is not set
|
||||||
# CONFIG_PIE is not set
|
CONFIG_PIE=y
|
||||||
# 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
|
||||||
|
|
|
@ -19,15 +19,6 @@ alternatives="
|
||||||
ntpd:ntpd:/etc/sv/busybox-ntpd
|
ntpd:ntpd:/etc/sv/busybox-ntpd
|
||||||
vi:vi:/usr/bin/busybox"
|
vi:vi:/usr/bin/busybox"
|
||||||
|
|
||||||
_cflags() {
|
|
||||||
local t=$1
|
|
||||||
local c="$CFLAGS"
|
|
||||||
case $t in
|
|
||||||
busybox-static) c="$c -static";;
|
|
||||||
esac
|
|
||||||
echo "$c"
|
|
||||||
}
|
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
mkdir -p src
|
mkdir -p src
|
||||||
mv * src || true
|
mv * src || true
|
||||||
|
@ -35,10 +26,15 @@ 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 CFLAGS="$(_cflags $t)" KBUILD_SRC=${wrksrc}/src \
|
make -C $t KBUILD_SRC=${wrksrc}/src -f ${wrksrc}/src/Makefile defconfig
|
||||||
-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/ \
|
||||||
|
@ -62,7 +58,7 @@ do_configure() {
|
||||||
do_build() {
|
do_build() {
|
||||||
local t
|
local t
|
||||||
for t in busybox busybox-static; do
|
for t in busybox busybox-static; do
|
||||||
make -C $t SKIP_STRIP=y CFLAGS="$(_cflags $t)" LFLAGS="$LDFLAGS" ${makejobs}
|
make -C $t SKIP_STRIP=y ${makejobs}
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
do_check() {
|
do_check() {
|
||||||
|
|
Loading…
Reference in a new issue