forked from pool/busybox
Accepting request 689870 from home:kukuk:container
- Implement rpm -E %_dbpath for kiwi (busybox-rpm-E.patch) - Don't require /bin/sh, be self contained - update to 1.30.1 * many bugfixes and new features - obsolete busybox-1.18.3-libarchive.patch - obsolete busybox-resource.patch - Update busybox*.config - Merge busybox.spec and busybox-static.spec and build the static binary as subpackage OBS-URL: https://build.opensuse.org/request/show/689870 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=49
This commit is contained in:
Ihno Krumreich
Git OBS Bridge
parent
3dce635314
commit
08d47d0085
@ -1,14 +0,0 @@
|
||||
Index: busybox-1.23.2/archival/libarchive/get_header_tar.c
|
||||
===================================================================
|
||||
--- busybox-1.23.2.orig/archival/libarchive/get_header_tar.c
|
||||
+++ busybox-1.23.2/archival/libarchive/get_header_tar.c
|
||||
@@ -304,6 +304,9 @@ char FAST_FUNC get_header_tar(archive_ha
|
||||
}
|
||||
file_header->link_target = NULL;
|
||||
if (!p_linkname && parse_names && tar.linkname[0]) {
|
||||
+ /* we trash magic[0] here to terminate tar.linkname, it's ok */
|
||||
+ tar.magic[0] = '\0';
|
||||
+
|
||||
file_header->link_target = xstrndup(tar.linkname, sizeof(tar.linkname));
|
||||
/* FIXME: what if we have non-link object with link_target? */
|
||||
/* Will link_target be free()ed? */
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
|
||||
size 2120931
|
||||
3
busybox-1.30.1.tar.bz2
Normal file
3
busybox-1.30.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc
|
||||
size 7793781
|
||||
@ -1,16 +0,0 @@
|
||||
---
|
||||
include/libbb.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: busybox-1.23.2/include/libbb.h
|
||||
===================================================================
|
||||
--- busybox-1.23.2.orig/include/libbb.h
|
||||
+++ busybox-1.23.2/include/libbb.h
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <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>
|
||||
30
busybox-rpm-E.patch
Normal file
30
busybox-rpm-E.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- archival/rpm.c
|
||||
+++ archival/rpm.c 2019/03/29 10:59:36
|
||||
@@ -358,7 +358,7 @@
|
||||
INIT_G();
|
||||
G.pagesize = getpagesize();
|
||||
|
||||
- while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
|
||||
+ while ((opt = getopt(argc, argv, "iqpldcE:")) != -1) {
|
||||
switch (opt) {
|
||||
case 'i': /* First arg: Install mode, with q: Information */
|
||||
if (!func) func = rpm_install;
|
||||
@@ -382,6 +382,18 @@
|
||||
func |= rpm_query_list;
|
||||
func |= rpm_query_list_config;
|
||||
break;
|
||||
+ case 'E': /* special hack for kiwi */
|
||||
+ if (strcmp (optarg, "%_dbpath") == 0)
|
||||
+ {
|
||||
+ if (access ("/usr/lib/sysimage/rpm", F_OK) == 0)
|
||||
+ printf ("/usr/lib/sysimage/rpm\n");
|
||||
+ else
|
||||
+ printf ("/var/lib/rpm\n");
|
||||
+ return 0;
|
||||
+ }
|
||||
+ else
|
||||
+ bb_show_usage();
|
||||
+ break;
|
||||
default:
|
||||
bb_show_usage();
|
||||
}
|
||||
@ -1,324 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 22 21:41:23 UTC 2018 - jjolly@suse.com
|
||||
|
||||
- Enabled functionality within busybox for warewulf compatibility
|
||||
* CONFIG_FEATURE_REMOTE_LOG
|
||||
* CONFIG_DEPMOD
|
||||
* CONFIG_TAC
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 18:36:03 CET 2017 - kukuk@suse.de
|
||||
|
||||
- Disable RPC/NFS, we don't have a static libtirpc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 2 11:27:52 UTC 2017 - astieger@suse.com
|
||||
|
||||
- update to 1.26.2:
|
||||
* many updates and fixes to individual tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 1 17:20:51 UTC 2016 - astieger@suse.com
|
||||
|
||||
- update to 1.25.1:
|
||||
* fixes for hush, gunzip, ip route, ntpd
|
||||
- includes changes from 1.25.0:
|
||||
* many added and expanded implementations of command options
|
||||
- includes changes from 1.24.2:
|
||||
* fixes for build system (static build with glibc fixed),
|
||||
truncate, gunzip and unzip.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 3 13:21:03 UTC 2016 - olaf@aepfle.de
|
||||
|
||||
- Disable build timestamp
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 3 12:01:09 UTC 2016 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 1.24.1
|
||||
* for a full list of changes see http://www.busybox.net/news.html
|
||||
- Refresh busybox.install.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 20 16:16:14 UTC 2015 - mpluskal@suse.com
|
||||
|
||||
- Update to 1.23.2
|
||||
* for a full list of changes see http://www.busybox.net/news.html
|
||||
- Cleaned up spec file with spec-cleaner
|
||||
- Refreshed patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 4 23:43:33 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- update to 1.22.1:
|
||||
Many updates and fixes for most included tools, see
|
||||
see http://www.busybox.net/news.html
|
||||
- adjust busybox-resource.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 12 23:21:11 UTC 2013 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 1.21.1
|
||||
+ fixes for ntfs detection (big-endian fix)
|
||||
+ xz decompression of concatenated streams
|
||||
+ mdev acquired a [ENV=regex;] extension instead of undocumented
|
||||
subsystem match hack it used to have prior to 1.21.x.
|
||||
- Changes from 1.21.0
|
||||
+ udhcpc: gracefully handle packets with CHECKSUM_PARTIAL
|
||||
+ ifupdown: improve compatibility with Debian
|
||||
+ get_linux_version_code: don't fail on Linux version strings
|
||||
like "3.0-foo"
|
||||
+ build system: fix build failure when only gunzip is selected
|
||||
+ CONFIG_PID_FILE_PATH: new configuration option for pidfile paths
|
||||
+ declare strings with ALIGN1, as appropriate
|
||||
+ nanddump: use the right operator of logic AND
|
||||
+ nanddump: skip bad blocks when instructed to do so
|
||||
+ nanddump: invert the meaning of the -o parameter to match upstream
|
||||
+ mount: fix -o user=foo mishandling, fix unc= generation, add prefixpath=
|
||||
+ build system: fix build of kconfig on Darwin
|
||||
+ tar: support -J, --xz explicit compression option
|
||||
+ simplify copyright/license notice that appears in the binary
|
||||
+ mdev: tell kernel that we didn't find the firmware
|
||||
+ lineedit: fix Alt-D when cursor==0
|
||||
+ lineedit: histfile can get emptied when CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
|
||||
+ build system: stop .eh_frame generation
|
||||
+ build system: fix build failure when compressed help is selected, but bz2 compression is not
|
||||
+ scripts/kconfig/mconf: work on systems w/o SIGWINCH
|
||||
+ platform.h: disable ALIGNn macros for s390[x]
|
||||
+ adduser: install to /usr, not /, like all other similar tools
|
||||
+ ash: fix "read -s" + ^C. Closes 5504
|
||||
+ ash: fix a bug in >${varexp} handling. Closes 5282
|
||||
+ ash: implement export -n
|
||||
+ ash: revert wrong "fix" for an apparent memory leak. Closes 5822
|
||||
+ awk: fix FS assignment behavior. Closes 5108
|
||||
+ awk: make -F STR interpret escape sequences. Closes 5126
|
||||
+ brctl: fix build failure by s/strtotimeval/bb_strtotimeval/ (android has strtotimeval)
|
||||
+ busybox: tweak help text and copyright year
|
||||
+ decompress_uncompress: comment out debug printout on corrupted data
|
||||
+ decompress_uncompress: move 'code' variable into loop - sole user
|
||||
+ dhcpd: write lease file on exit
|
||||
+ dpkg: fix creation of .list files (were empty since b768aeb). Closes 5324
|
||||
+ du: document incompatibility with standard tool
|
||||
+ examples/mdev_fat.conf: small addition
|
||||
+ find: if DESKTOP=y, support -wholename (synonym for -path)
|
||||
+ find: make -mindepth N -xdev correctly stop on mountpoints
|
||||
+ ftpd: fix MDTM's month value. Closes 5336
|
||||
+ ftpd: free allocated string on error path
|
||||
+ getty: fix for NOCTTY killing us with SIGHUP
|
||||
+ grep: fix grep -Fw not respecting the -w option. Closes 5792
|
||||
+ ifconfig: do not accept "ifconfig eth0 up 1.2.3.4/17" (ip with mask). Closes 5786
|
||||
+ libbb: correctness/size tweaks in signal-related helpers
|
||||
+ lineedit: in !EDITING config, return -1 on fgets error
|
||||
+ login: increase login name size limit from 32 to 64
|
||||
+ lpr: don't send 0-byte print jobs (compat)
|
||||
+ man: fix handling of gzipped manpages
|
||||
+ mdev: add support for $DEVNAME and /dev/mdev.log debug aid
|
||||
+ mdev: fix mode of dir1 in =dir1/dir2/file rule
|
||||
+ mdev: remove undocumented subsystem/devname matching hack
|
||||
+ mdev: when found, print major,minor into mdev.log
|
||||
+ modprobe_small: make rmmod to NOT remove dependencies. Closes 5162
|
||||
+ mount: do not pass "comment=ANYTHING" option to kernel. Closes 5240
|
||||
+ mount: fix the wrongly stored fs creation time
|
||||
+ mount: set up RO loop device if mount -o ro. Closes 4784
|
||||
+ mount: support strictatime option. Closes 5240
|
||||
+ ntpd: on time step, kill all outstanding replies from other peers
|
||||
+ sed: fix handling of s/// which has empty matches
|
||||
+ sed: fix zero chars match/replace
|
||||
+ sha3: make size/speed optimization decision configurable
|
||||
+ syslogd: do not segfault on parse error when using default config. Closes 5762
|
||||
+ telnet: convert CR -> CR LF, not CR -> CR NUL when sending data to server
|
||||
+ telnet: convert Enter -> CR LF in line mode too
|
||||
+ tftpd: fix -u USER to work with chroot. Closes 5348
|
||||
+ top/ps: argv0:"gdm-session-worker [pam/gdm-password]" == comm:"gdm-session-wor"
|
||||
+ top: do not touch stdin if -b
|
||||
+ top: fix "last CPU" parsing
|
||||
+ top: implement scrolling up/down (_very_ useful)
|
||||
+ udhcp[cd]: fix binding to network aliases. Closes 5432, 5438
|
||||
+ udhcpc: make -O <numeric_opt> work. Closes 5402
|
||||
+ udhcpc[6]: show select timeout in log
|
||||
+ unzip: make options parsing more robust on getopt w/o gnu extensions
|
||||
+ vi: do not set autoindent by default
|
||||
+ vi: nuke FEATURE_VI_OPTIMIZE_CURSOR
|
||||
+ vi: save/restore screen upon invocation
|
||||
+ volume_id/ext: detect ext4 too
|
||||
+ wget: correctly handle failure to -c (continue)
|
||||
+ wget: make -c _not_ truncate the file
|
||||
+ wget: reorder fread and poll: poll only if fread returns EAGAIN. Closes 5426
|
||||
+ wget: try reading after poll timeout - stdio may have buffered data. Closes 5426
|
||||
+ acpid: add missing lid switch definition
|
||||
+ tar: fix 256-bit encoded number decoding
|
||||
+ udhcpc[6]: allow discover_retries == 0 (infinite)
|
||||
+ ash: fix a memory leak
|
||||
+ sysctl: implement -q
|
||||
+ powertop: fix error message
|
||||
+ sha3sum: new applet
|
||||
+ fbset: respect rgba configuration lines in fb.modes
|
||||
+ fbsplash: support non-RGB565 pixels in 16-bit mode
|
||||
+ flashcp: remove unused variable opts
|
||||
+ mount: add unc option to CIFS mount (needed for Linux 3.4+)
|
||||
+ nanddump: make dumping read-only partitions work
|
||||
+ ps: use separate get_uptime() and make it work on non-linux too
|
||||
+ declare strings with ALIGN1, as appropriate
|
||||
+ udhcpc6: depend on ipv6
|
||||
+ include sys/resource.h where needed
|
||||
+ disable format security warnings
|
||||
+ build system: use pkg-config to look up selinux libs
|
||||
+ ifenslave: fix missing close paren
|
||||
+ sed: allow 'w' cmd to use two address form
|
||||
+ tar: implement --no-recursion
|
||||
+ unzip: ignore chmod errors
|
||||
+ brctl: fix description and usage
|
||||
+ su: do not change to home dir unless -l
|
||||
+ ntpd: fix incorrect m_status field in outgoing packets. Closes 5120
|
||||
+ dmesg: handle multi-char log levels
|
||||
+ klogd: handle multi-char log levels
|
||||
+ syslogd: add option to log to Linux kernel printk buffer
|
||||
+ syslogd: convert dummy functions to statics and get rid of IF_FEATURE_* checks
|
||||
+ config: do not refer to HTTPS for wget
|
||||
+ sendmail: use host rather than NIS domain name for HELO
|
||||
+ mktemp: fix mktemp -u temp.XXXXXX returning garbage when TMPDIR is set
|
||||
+ blkid: show filesystem when both label and UUID are missing, but type is known
|
||||
+ volume_id: add exFAT detection
|
||||
+ ln: support -T and -v
|
||||
+ sed: support long opts and -iSFX
|
||||
+ mkdir,rmdir: accept and ignore -v, --verbose
|
||||
+ mv: accept but ignore -v
|
||||
+ blkid: add type display for btrfs
|
||||
+ blkid: add support for nilfs2
|
||||
+ blkid: add type display for hfsplus
|
||||
+ volume_id: display hfs[+] 128-bit UUID properly
|
||||
+ volume_id: uuid_format small code shrink
|
||||
+ volume_id: add squashfs detection
|
||||
+ testsuite: some more awk tests related to conditions
|
||||
+ modinfo: match more standard module fields and fix version field
|
||||
+ inetd: fix build failure in Android
|
||||
+ android: fix 'stat', ifdef S_TYPEIS* in coreutiles/stat.c
|
||||
+ platform.h: Android tweaks: ioprio defines, BB_ADDITIONAL_PATH
|
||||
+ android: some sensible defconfig changes
|
||||
+ libbb: add missing_syscalls.c: for now, only Android syscalls
|
||||
+ fbsplash: fix regression from e4fa7b7
|
||||
+ adduser: make it accept "adduser USER GROUP" form
|
||||
+ wget: add dummy --no-cache
|
||||
+ testsuite: make mkfs.minix test not fail spuriously on big endian
|
||||
+ refactor correct_password.c to avoid one if
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 6 15:07:49 UTC 2013 - ddiss@suse.com
|
||||
|
||||
- Build against glibc-devel-static to work around uClibc segfault;
|
||||
(bnc#758843).
|
||||
* Remove uClibc specific busybox.uClibc-build-fix.patch.
|
||||
* Add busybox-static.SuSE.config, which specifies CONFIG_STATIC=y.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 9 14:15:07 UTC 2012 - p.drouand@gmail.com
|
||||
|
||||
- Update to 1.20.2 (Bug fix release):
|
||||
* fix for variable expansion in redirection
|
||||
* fix for "pre-up" and "pre-down" handling
|
||||
* fixes for compressed man pages handling
|
||||
* important fix! due to misplaced s_mkfs_time field, ext4 driver
|
||||
couldn't mount our images
|
||||
* fix for getting uptime on non-Linux platforms
|
||||
* fix base-256 decoding
|
||||
- Remove busybox-1.19.4-ext2fs_h.diff: fixed on upstream release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 18 07:44:02 UTC 2012 - aj@suse.de
|
||||
|
||||
- Add missing sys/resource include (glibc 2.16)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 6 13:02:52 UTC 2012 - seife+obs@b1-systems.com
|
||||
|
||||
- busybox-1.19.4-ext2fs_h.diff:
|
||||
more complete fix for latest ext2_fs.h breakage from busybox git,
|
||||
drop busybox-1.19.4-typedef_umode_t.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 10 15:20:58 CEST 2012 - ro@suse.de
|
||||
|
||||
- busybox-1.19.4-typedef_umode_t.patch:
|
||||
fix compile as umode_t is only defined with KERNEL and is
|
||||
used in header linux/linux/ext2_fs.h
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 10 14:59:02 CEST 2012 - ro@suse.de
|
||||
|
||||
- update to 1.19.4
|
||||
- fix getty, mdev, modinfo and wget
|
||||
- update to 1.19.3
|
||||
- fix chpasswd, crond, inetd, syslogd, tail, tftp
|
||||
- update to 1.19.2
|
||||
- fix ash/hush, cttyhack, find, grep, less, patch, sed, top,
|
||||
uncompress
|
||||
- update to 1.19.0:
|
||||
- countless fixes in all utility programs, please see
|
||||
http://www.busybox.net/ for details
|
||||
|
||||
- remove obsolete patches previously marked as upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 30 14:46:04 UTC 2011 - uli@suse.com
|
||||
|
||||
- cross-build fix: use %__cc macro, set HOSTCC
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 17 21:08:55 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Remove redundant tags/sections from specfile
|
||||
- Remove unexplained ExcludeArch directive
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 12 23:03:39 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- update to 1.18.13
|
||||
see http://www.busybox.net/ for full changelog
|
||||
- add upstream patches
|
||||
o buildsys.patch
|
||||
o cksum.patch
|
||||
o klogd.patch
|
||||
o menuconfig.patch
|
||||
o modutils24.patch
|
||||
o wget.patch
|
||||
- rework libunarchive-array patch
|
||||
o -> libarchive patch
|
||||
- remove .gitignore files
|
||||
- added missing BusyBox.1 as S:1
|
||||
- added export CFLAGS="{optflags} -fno-strict-aliasing"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de
|
||||
|
||||
- Use %_smp_mflags
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 6 16:41:32 UTC 2010 - aj@suse.de
|
||||
|
||||
- Update to busybox 1.17.2:
|
||||
* obsoletes patches busybox.dmesg-size.patch, busybox-1.17.1-make.patch,
|
||||
busybox-buildfix.patch
|
||||
* see http://www.busybox.net/ for full changelog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 20 13:25:00 UTC 2010 - coolo@novell.com
|
||||
|
||||
- add backported fix for make 3.82
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 4 18:14:50 CEST 2009 - aj@suse.de
|
||||
|
||||
- Fix build with newer kernel headers (busybox-buildfix.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 11:35:49 CET 2008 - sassmann@suse.de
|
||||
|
||||
- update to 1.12.3 bugfix release
|
||||
* has fixes for option parsing and line editing
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 4 14:00:43 CET 2008 - sassmann@suse.de
|
||||
|
||||
- initial release of busybox-static (version 1.12.1)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,77 +0,0 @@
|
||||
#
|
||||
# spec file for package busybox-static
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: busybox-static
|
||||
Version: 1.26.2
|
||||
Release: 0
|
||||
Summary: The Swiss Army Knife of Embedded Linux
|
||||
License: GPL-2.0+
|
||||
Group: System/Base
|
||||
Url: http://www.busybox.net/
|
||||
Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2
|
||||
Source1: BusyBox.1
|
||||
Source2: busybox-static.SuSE.config
|
||||
# other patches
|
||||
Patch100: busybox.install.patch
|
||||
Patch101: busybox-1.18.3-libarchive.patch
|
||||
Patch103: busybox-resource.patch
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
BusyBox combines tiny versions of many common UNIX utilities into a
|
||||
small single executable. It provides minimalist replacements for most
|
||||
of the utilities usually found in fileutils, shellutils, findutils,
|
||||
textutils, grep, gzip, tar, and more. BusyBox provides a fairly
|
||||
complete POSIX environment for any small or embedded system. The
|
||||
utilities in BusyBox generally have fewer options than their
|
||||
full-featured GNU cousins. The options that are included provide the
|
||||
expected functionality and behave very much like their GNU
|
||||
counterparts.
|
||||
|
||||
%prep
|
||||
%setup -q -n busybox-%{version}
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch103 -p1
|
||||
cp -a %{SOURCE1} docs/
|
||||
cp -a %{SOURCE2} .config
|
||||
find -name CVS | xargs rm -rf
|
||||
find -name .cvsignore | xargs rm -rf
|
||||
find -name .svn | xargs rm -rf
|
||||
find -name .gitignore | xargs rm -rf
|
||||
|
||||
%build
|
||||
export KCONFIG_NOTIMESTAMP=KCONFIG_NOTIMESTAMP
|
||||
export VERBOSE=-v
|
||||
export BUILD_VERBOSE=2
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
export CC="gcc"
|
||||
export HOSTCC=gcc
|
||||
make %{?_smp_mflags} -e oldconfig
|
||||
make -e %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
install -d %{buildroot}/%{_bindir}
|
||||
install busybox %{buildroot}/%{_bindir}/busybox-static
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/busybox-static
|
||||
|
||||
%changelog
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 29 12:03:49 CET 2019 - kukuk@suse.de
|
||||
|
||||
- Implement rpm -E %_dbpath for kiwi (busybox-rpm-E.patch)
|
||||
- Don't require /bin/sh, be self contained
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 28 21:58:41 CET 2019 - kukuk@suse.de
|
||||
|
||||
- update to 1.30.1
|
||||
* many bugfixes and new features
|
||||
- obsolete busybox-1.18.3-libarchive.patch
|
||||
- obsolete busybox-resource.patch
|
||||
- Update busybox*.config
|
||||
- Merge busybox.spec and busybox-static.spec and build the static
|
||||
binary as subpackage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 22 21:41:23 UTC 2018 - jjolly@suse.com
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,25 +1,32 @@
|
||||
Index: busybox-1.19.4/applets/install.sh
|
||||
===================================================================
|
||||
--- busybox-1.19.4.orig/applets/install.sh
|
||||
+++ busybox-1.19.4/applets/install.sh
|
||||
@@ -5,14 +5,14 @@
|
||||
--- applets/install.sh
|
||||
+++ applets/install.sh 2019/03/29 09:03:34
|
||||
@@ -1,11 +1,11 @@
|
||||
-#!/bin/sh
|
||||
+#!/usr/bin/busybox sh
|
||||
|
||||
export LC_ALL=POSIX
|
||||
export LC_CTYPE=POSIX
|
||||
|
||||
prefix=$1
|
||||
if [ -z "$prefix" ]; then
|
||||
- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
|
||||
+ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
|
||||
- echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]"
|
||||
+ echo "usage: busybox.install DESTINATION TYPE [OPTS ...]"
|
||||
echo " TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none"
|
||||
echo " OPTS is one or more of: --cleanup --noclobber"
|
||||
exit 1
|
||||
fi
|
||||
@@ -13,9 +13,9 @@
|
||||
shift # Keep only remaining options
|
||||
|
||||
# Source the configuration
|
||||
. ./.config
|
||||
-. ./.config
|
||||
+#. ./.config
|
||||
|
||||
-h=`sort busybox.links | uniq`
|
||||
+h=`sort /usr/share/busybox/busybox.links | uniq`
|
||||
|
||||
sharedlib_dir="0_lib"
|
||||
|
||||
@@ -64,7 +64,7 @@ fi
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
rm -f "$prefix/bin/busybox" || exit 1
|
||||
mkdir -p "$prefix/bin" || exit 1
|
||||
|
||||
59
busybox.spec
59
busybox.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package busybox
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,24 +12,26 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: busybox
|
||||
Version: 1.26.2
|
||||
Version: 1.30.1
|
||||
Release: 0
|
||||
Summary: The Swiss Army Knife of Embedded Linux
|
||||
License: GPL-2.0+
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Base
|
||||
Url: http://www.busybox.net/
|
||||
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2
|
||||
Source1: BusyBox.1
|
||||
Source2: busybox.SuSE.config
|
||||
Source2: busybox.config
|
||||
Source3: busybox-static.config
|
||||
# other patches
|
||||
Patch100: busybox.install.patch
|
||||
Patch101: %{name}-1.18.3-libarchive.patch
|
||||
Patch103: busybox-resource.patch
|
||||
Patch: busybox.install.patch
|
||||
# kiwi requires "rpm -E %%_dbpath" working
|
||||
Patch1: busybox-rpm-E.patch
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -44,13 +46,27 @@ full-featured GNU cousins. The options that are included provide the
|
||||
expected functionality and behave very much like their GNU
|
||||
counterparts.
|
||||
|
||||
%package static
|
||||
Summary: Static linked Swiss Army Knife of Embedded Linux
|
||||
Group: System/Base
|
||||
|
||||
%description static
|
||||
The static linked BusyBox combines tiny versions of many common UNIX utilities into a
|
||||
small single executable. It provides minimalist replacements for most
|
||||
of the utilities usually found in fileutils, shellutils, findutils,
|
||||
textutils, grep, gzip, tar, and more. BusyBox provides a fairly
|
||||
complete POSIX environment for any small or embedded system. The
|
||||
utilities in BusyBox generally have fewer options than their
|
||||
full-featured GNU cousins. The options that are included provide the
|
||||
expected functionality and behave very much like their GNU
|
||||
counterparts.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch103 -p1
|
||||
%patch -p0
|
||||
%patch1 -p0
|
||||
cp -a %{SOURCE1} docs/
|
||||
cp -a %{SOURCE2} .config
|
||||
find -name CVS | xargs rm -rf
|
||||
find -name .cvsignore | xargs rm -rf
|
||||
find -name .svn | xargs rm -rf
|
||||
@ -63,6 +79,12 @@ export BUILD_VERBOSE=2
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc"
|
||||
export CC="gcc"
|
||||
export HOSTCC=gcc
|
||||
cp -a %{SOURCE3} .config
|
||||
make %{?_smp_mflags} -e oldconfig
|
||||
make -e %{?_smp_mflags}
|
||||
mv busybox busybox-static
|
||||
make -e %{?_smp_mflags} clean
|
||||
cp -a %{SOURCE2} .config
|
||||
make %{?_smp_mflags} -e oldconfig
|
||||
make -e %{?_smp_mflags}
|
||||
make -e doc busybox.links %{?_smp_mflags}
|
||||
@ -70,19 +92,26 @@ make -e doc busybox.links %{?_smp_mflags}
|
||||
%install
|
||||
install -d %{buildroot}/%{_bindir}
|
||||
install -d %{buildroot}/%{_datadir}/busybox
|
||||
install busybox.links %{buildroot}%{_datadir}/busybox
|
||||
install -m 0644 busybox.links %{buildroot}%{_datadir}/busybox
|
||||
install applets/install.sh %{buildroot}%{_bindir}/busybox.install
|
||||
install busybox %{buildroot}/%{_bindir}
|
||||
install -m 0755 busybox %{buildroot}/%{_bindir}
|
||||
install -m 0755 busybox-static %{buildroot}/%{_bindir}
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%doc docs/mdev.txt
|
||||
%doc %{_mandir}/man1/BusyBox.1.gz
|
||||
%{_bindir}/busybox
|
||||
%{_bindir}/busybox.install
|
||||
%dir %{_datadir}/busybox
|
||||
%config %{_datadir}/busybox/busybox.links
|
||||
%{_datadir}/busybox/busybox.links
|
||||
|
||||
%files static
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%{_bindir}/busybox-static
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user