Accepting request 48586 from Base:System
Copy from Base:System/busybox based on submit request 48586 from user elvigia OBS-URL: https://build.opensuse.org/request/show/48586 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=18
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
b9ef6e74c9
commit
7e4468d042
33
busybox-1.17.1-make.patch
Normal file
33
busybox-1.17.1-make.patch
Normal file
@ -0,0 +1,33 @@
|
||||
Index: busybox-1.12.3/Makefile
|
||||
===================================================================
|
||||
--- busybox-1.12.3.orig/Makefile 2008-11-29 07:42:31.000000000 +0100
|
||||
+++ busybox-1.12.3/Makefile 2010-09-20 15:22:10.919807047 +0200
|
||||
@@ -418,7 +418,12 @@ ifeq ($(config-targets),1)
|
||||
-include $(srctree)/arch/$(ARCH)/Makefile
|
||||
export KBUILD_DEFCONFIG
|
||||
|
||||
-config %config: scripts_basic outputmakefile FORCE
|
||||
+config: scripts_basic outputmakefile FORCE
|
||||
+ $(Q)mkdir -p include
|
||||
+ $(Q)$(MAKE) $(build)=scripts/kconfig $@
|
||||
+ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
|
||||
+
|
||||
+%config: scripts_basic outputmakefile FORCE
|
||||
$(Q)mkdir -p include
|
||||
$(Q)$(MAKE) $(build)=scripts/kconfig $@
|
||||
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
|
||||
@@ -1259,9 +1264,13 @@ endif
|
||||
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
|
||||
|
||||
# Modules
|
||||
-/ %/: prepare scripts FORCE
|
||||
+%/: prepare scripts FORCE
|
||||
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
|
||||
$(build)=$(build-dir)
|
||||
+/: prepare scripts FORCE
|
||||
+ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
|
||||
+ $(build)=$(build-dir)
|
||||
+
|
||||
%.ko: prepare scripts FORCE
|
||||
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
|
||||
$(build)=$(build-dir) $(@:.ko=.o)
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package busybox-static (Version 1.12.3)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -21,9 +21,9 @@
|
||||
Name: busybox-static
|
||||
Url: http://www.busybox.net/
|
||||
Version: 1.12.3
|
||||
Release: 3
|
||||
Release: 10
|
||||
Summary: The Swiss Army Knife of Embedded Linux
|
||||
License: GPL v2 or later
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
AutoReqProv: on
|
||||
Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2
|
||||
@ -35,6 +35,7 @@ Patch100: busybox.install.patch
|
||||
Patch101: busybox.libunarchive-array.patch
|
||||
Patch102: busybox.dmesg-size.patch
|
||||
Patch103: busybox-buildfix.patch
|
||||
Patch104: http://busybox.net/downloads/fixes-1.17.1/busybox-1.17.1-make.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: uClibc-devel
|
||||
ExcludeArch: s390 s390x ppc64
|
||||
@ -50,12 +51,6 @@ full-featured GNU cousins. The options that are included provide the
|
||||
expected functionality and behave very much like their GNU
|
||||
counterparts.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Erik B. Andersen <andersee@debian.org>
|
||||
|
||||
%prep
|
||||
%setup -q -n busybox-%{version}
|
||||
%patch1 -p1
|
||||
@ -63,6 +58,7 @@ Authors:
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103
|
||||
%patch104 -p1
|
||||
|
||||
%build
|
||||
cp -avL %{S:2} .config
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 20 13:25:00 UTC 2010 - coolo@novell.com
|
||||
|
||||
- add backported fix for make 3.82
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 4 18:13:36 CEST 2009 - aj@suse.de
|
||||
|
||||
|
||||
14
busybox.spec
14
busybox.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package busybox (Version 1.12.3)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -21,9 +21,9 @@
|
||||
Name: busybox
|
||||
Url: http://www.busybox.net/
|
||||
Version: 1.12.3
|
||||
Release: 3
|
||||
Release: 10
|
||||
Summary: The Swiss Army Knife of Embedded Linux
|
||||
License: GPL v2 or later
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
AutoReqProv: on
|
||||
Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2
|
||||
@ -34,6 +34,7 @@ Patch100: busybox.install.patch
|
||||
Patch101: busybox.libunarchive-array.patch
|
||||
Patch102: busybox.dmesg-size.patch
|
||||
Patch103: busybox-buildfix.patch
|
||||
Patch104: http://busybox.net/downloads/fixes-1.17.1/busybox-1.17.1-make.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -47,18 +48,13 @@ full-featured GNU cousins. The options that are included provide the
|
||||
expected functionality and behave very much like their GNU
|
||||
counterparts.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Erik B. Andersen <andersee@debian.org>
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103
|
||||
%patch104 -p1
|
||||
|
||||
%build
|
||||
cp -avL %{S:2} .config
|
||||
|
||||
Loading…
Reference in New Issue
Block a user