wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

base-system-busybox: update to 1.21.1.

Browse source
This commit is contained in:
Juan RP 2013-12-08 13:14:00 +01:00
parent 1647013a1f
commit 29ef364c53
5 changed files with 65 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
srcpkgs/base-system-busybox/files/dotconfig
View file

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.20.2 # Busybox version: 1.21.1
# Thu Aug 30 08:07:02 2012 # Sun Dec 8 12:43:34 2013
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_PIDFILE=y
CONFIG_PID_FILE_PATH="/run"
CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@ -54,8 +55,8 @@ CONFIG_FEATURE_HAVE_RPC=y
# #
# Build Options # Build Options
# #
# CONFIG_STATIC is not set CONFIG_STATIC=y
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_INDIVIDUAL is not set # CONFIG_FEATURE_INDIVIDUAL is not set
@ -81,10 +82,10 @@ CONFIG_NO_DEBUG_LIB=y
# Installation Options ("make install" behavior) # Installation Options ("make install" behavior)
# #
# CONFIG_INSTALL_APPLET_SYMLINKS is not set # CONFIG_INSTALL_APPLET_SYMLINKS is not set
# CONFIG_INSTALL_APPLET_HARDLINKS is not set CONFIG_INSTALL_APPLET_HARDLINKS=y
CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS=y # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
# CONFIG_INSTALL_APPLET_DONT is not set # CONFIG_INSTALL_APPLET_DONT is not set
CONFIG_INSTALL_SH_APPLET_SYMLINK=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
CONFIG_PREFIX="./_install" CONFIG_PREFIX="./_install"
@ -96,6 +97,7 @@ CONFIG_FEATURE_SYSTEMD=y
CONFIG_FEATURE_RTMINMAX=y CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6 CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1 CONFIG_MD5_SMALL=1
CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_FAST_TOP=y
CONFIG_FEATURE_ETC_NETWORKS=y CONFIG_FEATURE_ETC_NETWORKS=y
CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_USE_TERMIOS=y
@ -263,6 +265,7 @@ CONFIG_SEQ=y
CONFIG_SHA1SUM=y CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y CONFIG_SHA256SUM=y
CONFIG_SHA512SUM=y CONFIG_SHA512SUM=y
CONFIG_SHA3SUM=y
CONFIG_SLEEP=y CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y
@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_FEATURE_HUMAN_READABLE=y
# #
# Common options for md5sum, sha1sum, sha256sum, sha512sum # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
# #
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
@ -319,14 +322,14 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
# #
# CONFIG_CHVT is not set # CONFIG_CHVT is not set
# CONFIG_FGCONSOLE is not set # CONFIG_FGCONSOLE is not set
CONFIG_CLEAR=y # CONFIG_CLEAR is not set
# CONFIG_DEALLOCVT is not set # CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set # CONFIG_DUMPKMAP is not set
# CONFIG_KBD_MODE is not set # CONFIG_KBD_MODE is not set
# CONFIG_LOADFONT is not set # CONFIG_LOADFONT is not set
# CONFIG_LOADKMAP is not set # CONFIG_LOADKMAP is not set
# CONFIG_OPENVT is not set # CONFIG_OPENVT is not set
CONFIG_RESET=y # CONFIG_RESET is not set
CONFIG_RESIZE=y CONFIG_RESIZE=y
CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_FEATURE_RESIZE_PRINT=y
# CONFIG_SETCONSOLE is not set # CONFIG_SETCONSOLE is not set
@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
CONFIG_AWK=y CONFIG_AWK=y
CONFIG_FEATURE_AWK_LIBM=y CONFIG_FEATURE_AWK_LIBM=y
CONFIG_CMP=y CONFIG_CMP=y
@ -464,7 +466,7 @@ CONFIG_LAST_SYSTEM_ID=0
CONFIG_GETTY=y CONFIG_GETTY=y
CONFIG_LOGIN=y CONFIG_LOGIN=y
CONFIG_LOGIN_SESSION_AS_CHILD=y CONFIG_LOGIN_SESSION_AS_CHILD=y
CONFIG_PAM=y # CONFIG_PAM is not set
CONFIG_LOGIN_SCRIPTS=y CONFIG_LOGIN_SCRIPTS=y
CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_NOLOGIN=y
CONFIG_FEATURE_SECURETTY=y CONFIG_FEATURE_SECURETTY=y
@ -612,9 +614,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_FAT=y
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_HFS=y
CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_JFS=y
CONFIG_FEATURE_VOLUMEID_XFS=y CONFIG_FEATURE_VOLUMEID_XFS=y
CONFIG_FEATURE_VOLUMEID_NILFS=y
CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_ISO9660=y
CONFIG_FEATURE_VOLUMEID_UDF=y CONFIG_FEATURE_VOLUMEID_UDF=y
@ -622,6 +626,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y
CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_SYSV=y
CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_OCFS2=y
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
@ -752,19 +757,19 @@ CONFIG_FTPGET=y
CONFIG_FTPPUT=y CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y CONFIG_HOSTNAME=y
CONFIG_HTTPD=y # CONFIG_HTTPD is not set
CONFIG_FEATURE_HTTPD_RANGES=y # CONFIG_FEATURE_HTTPD_RANGES is not set
CONFIG_FEATURE_HTTPD_USE_SENDFILE=y # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
CONFIG_FEATURE_HTTPD_SETUID=y # CONFIG_FEATURE_HTTPD_SETUID is not set
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
CONFIG_FEATURE_HTTPD_AUTH_MD5=y # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
CONFIG_FEATURE_HTTPD_CGI=y # CONFIG_FEATURE_HTTPD_CGI is not set
CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
CONFIG_FEATURE_HTTPD_PROXY=y # CONFIG_FEATURE_HTTPD_PROXY is not set
CONFIG_FEATURE_HTTPD_GZIP=y # CONFIG_FEATURE_HTTPD_GZIP is not set
CONFIG_IFCONFIG=y CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=y CONFIG_FEATURE_IFCONFIG_SLIP=y
@ -894,6 +899,13 @@ CONFIG_POWERTOP=y
CONFIG_PSTREE=y CONFIG_PSTREE=y
CONFIG_PWDX=y CONFIG_PWDX=y
CONFIG_SMEMCAP=y CONFIG_SMEMCAP=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_SMP_CPU=y
CONFIG_FEATURE_TOP_DECIMALS=y
CONFIG_FEATURE_TOP_SMP_PROCESS=y
CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y CONFIG_UPTIME=y
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_FREE=y CONFIG_FREE=y
@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y CONFIG_BB_SYSCTL=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_SMP_CPU=y
CONFIG_FEATURE_TOP_DECIMALS=y
CONFIG_FEATURE_TOP_SMP_PROCESS=y
CONFIG_FEATURE_TOPMEM=y
CONFIG_FEATURE_SHOW_THREADS=y CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_WATCH=y CONFIG_WATCH=y
@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
# CONFIG_LOGREAD is not set # CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
# CONFIG_FEATURE_KMSG_SYSLOG is not set
# CONFIG_KLOGD is not set # CONFIG_KLOGD is not set
# CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
CONFIG_LOGGER=y CONFIG_LOGGER=y

10
srcpkgs/base-system-busybox/files/udhcpc@.service
View file

@ -1,10 +0,0 @@
[Unit]
Description=Micro DHCP client on %I
Wants=network.target
Before=network.target
[Service]
ExecStart=/sbin/udhcpc -t 10 -p /var/run/udhcpc-%I.pid -R -f -n -i %I
[Install]
Alias=multi-user.target.wants/udhcpc@eth0.service

10
srcpkgs/base-system-busybox/patches/glibc-2.16.patch
View file

@ -1,10 +0,0 @@
--- include/libbb.h.orig 2012-07-09 15:18:29.296170184 +0200
+++ include/libbb.h 2012-07-09 15:18:41.374877927 +0200
@@ -40,6 +40,7 @@
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>

22
srcpkgs/base-system-busybox/patches/mount_strictatime.patch
View file

@ -1,22 +0,0 @@
Add support for strictatime mount option.
https://bugs.busybox.net/show_bug.cgi?id=5474
--- util-linux/mount.c.orig 2012-08-29 16:30:19.164282575 +0200
+++ util-linux/mount.c 2012-08-29 16:30:03.088660739 +0200
@@ -235,6 +235,7 @@ static const int32_t mount_options[] = {
/* "noatime" */ MS_NOATIME,
/* "diratime" */ ~MS_NODIRATIME,
/* "nodiratime" */ MS_NODIRATIME,
+ /* "strictatime" */ MS_STRICTATIME,
/* "mand" */ MS_MANDLOCK,
/* "nomand" */ ~MS_MANDLOCK,
/* "relatime" */ MS_RELATIME,
@@ -291,6 +292,7 @@ static const char mount_option_str[] =
"noatime\0"
"diratime\0"
"nodiratime\0"
+ "strictatime\0"
"mand\0"
"nomand\0"
"relatime\0"

62
srcpkgs/base-system-busybox/template
View file

@ -1,26 +1,15 @@
# Build template for 'base-system-live-busybox'. # Build template for 'base-system-busybox'.
pkgname=base-system-busybox pkgname=base-system-busybox
version=1.20.2 version=1.21.1
revision=4 revision=1
wrksrc="busybox-${version}" wrksrc="busybox-${version}"
homepage="http://www.busybox.net" homepage="http://www.busybox.net"
makedepends="perl pam-devel" makedepends="perl"
short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live" short_desc="The Swiss Army Knife of Embedded Linux - base-system replacements"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
distfiles="${homepage}/downloads/busybox-$version.tar.bz2" distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
checksum=eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303
long_desc="
BusyBox combines tiny versions of many common UNIX utilities into a single
small executable. It provides replacements for most of the utilities you
usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox
generally have fewer options than their full-featured GNU cousins; however,
the options that are included provide the expected functionality and behave
very much like their GNU counterparts. BusyBox provides a fairly complete
environment for any small or embedded system.
This package is only meant to be installed by void-mklive utility and shall
not be installed into a running system."
do_build() { do_build() {
cp -f ${FILESDIR}/dotconfig .config cp -f ${FILESDIR}/dotconfig .config
@ -28,28 +17,31 @@ do_build() {
} }
do_install() { do_install() {
make CONFIG_PREFIX=${DESTDIR} install # Install everything to /usr/bin.
vmkdir usr/bin vmkdir usr/bin
vmkdir usr/sbin for f in bin sbin usr/sbin; do
vmove "bin/*" usr/bin ln -sfr ${DESTDIR}/usr/bin ${DESTDIR}/${f}
vmove "sbin/*" usr/sbin done
make CONFIG_PREFIX=${DESTDIR} install
chmod 4755 ${DESTDIR}/usr/bin/busybox vinstall ${FILESDIR}/udhcpc-default.script \
755 usr/share/udhcpc default.script
vinstall ${FILESDIR}/udhcpc@.service 644 usr/lib/systemd/system rm -f ${DESTDIR}/{bin,sbin,usr/sbin}
vinstall ${FILESDIR}/udhcpc-default.script 755 usr/share/udhcpc default.script
} }
base-system-busybox_package() { base-system-busybox_package() {
replaces="base-busybox>=0 base-system-live-busybox>=0" # Applets provided by this busybox version.
provides="coreutils-1.20.2 util-linux-1.20.2 run-parts-1.20.2 # Keep this list updated with ${FILESDIR}/dotconfig.
dosfstools-1.20.2 grep-1.20.2 findutils-1.20.2 sed-1.20.2 #
procps-1.20.2" # XXX bzip2 provides libbz2, split it into libbz2 pkg.
conflicts="base-system>=0 run-parts>=0 coreutils>=0 util-linux>=0 FEATURES="acpid coreutils cpio dash dosfstools findutils gawk grep
dosfstools>=0 grep>=0 findutils>=0 sed>=0 procps>=0" gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
patch powertop procps-ng psmisc rfkill run-parts sed tar
traceroute util-linux wget which xz"
for f in ${FEATURES}; do
provides+="${f}-${version}_${revision} "
replaces+="${f}>=0 "
done
pkg_install() { pkg_install() {
vmove etc vmove all
vmove usr
} }
} }