Commit 00a336c1 authored by lbt's avatar lbt

Merge branch 'jb40842' into 'master'

Add time, iputils and mkfs.vfat.

See merge request !1
parents 69722edb 355bef47
......@@ -543,7 +543,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set
# CONFIG_MKFS_REISER is not set
# CONFIG_MKFS_VFAT is not set
CONFIG_MKFS_VFAT=y
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
# CONFIG_HEXDUMP is not set
......@@ -693,7 +693,7 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_STRINGS is not set
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_TIME is not set
CONFIG_TIME=y
# CONFIG_TIMEOUT is not set
# CONFIG_TTYSIZE is not set
# CONFIG_VOLNAME is not set
......@@ -710,16 +710,16 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_NC_SERVER is not set
# CONFIG_NC_EXTRA is not set
# CONFIG_NC_110_COMPAT is not set
# CONFIG_PING is not set
# CONFIG_PING6 is not set
# CONFIG_FEATURE_FANCY_PING is not set
CONFIG_PING=y
CONFIG_PING6=y
CONFIG_FEATURE_FANCY_PING=y
# CONFIG_WHOIS is not set
# CONFIG_FEATURE_IPV6 is not set
CONFIG_FEATURE_IPV6=y
# CONFIG_FEATURE_UNIX_LOCAL is not set
# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
CONFIG_ARPING=y
# CONFIG_BRCTL is not set
# CONFIG_FEATURE_BRCTL_FANCY is not set
# CONFIG_FEATURE_BRCTL_SHOW is not set
......@@ -809,8 +809,8 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
# CONFIG_TFTP_DEBUG is not set
# CONFIG_TRACEROUTE is not set
# CONFIG_TRACEROUTE6 is not set
CONFIG_TRACEROUTE=y
CONFIG_TRACEROUTE6=y
# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
......
......@@ -9,6 +9,12 @@ Source1: rpm/udhcpd.service
Source2: busybox-static.config
URL: https://github.com/mer-packages/busybox
Obsoletes: time <= 1.7
Provides: time > 1.7
Obsoletes: iputils <= 20101006
Provides: iputils > 20101006
BuildRequires: glibc-static
%define debug_package %{nil}
......@@ -103,6 +109,14 @@ install -m 755 busybox-static %{buildroot}/bin/busybox-static
%defattr(-,root,root,-)
%doc LICENSE
/bin/busybox
/bin/ping
/bin/ping6
/sbin/mkdosfs
/sbin/mkfs.vfat
/usr/bin/time
/usr/bin/traceroute
/usr/bin/traceroute6
/usr/sbin/arping
%files static
%defattr(-,root,root,-)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment