SPECS: busybox.spec - updated to 1.3.1, updated configs - updated ...

qboosh qboosh at pld-linux.org
Sat Dec 30 14:29:36 CET 2006


Author: qboosh                       Date: Sat Dec 30 13:29:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.3.1, updated configs
- updated printf-gettext,loadfont,dhcp patches
- readded LFS patch (only one part left, the rest is obsolete at last)
- added noshadow patch to fix build without shadow support

---- Files affected:
SPECS:
   busybox.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.120 SPECS/busybox.spec:1.121
--- SPECS/busybox.spec:1.120	Thu Nov  9 18:50:26 2006
+++ SPECS/busybox.spec	Sat Dec 30 14:29:30 2006
@@ -36,12 +36,12 @@
 Summary(pl):	Zestaw narzędzi uniksowych dla systemów wbudowanych
 Summary(pt_BR):	BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:		busybox
-Version:	1.2.2
+Version:	1.3.1
 Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	ae8a4c65b9464c8ece3483a3d3b9544c
+# Source0-md5:	571531cfa83726947ccb566de017ad4f
 Source1:	%{name}.config
 Source2:	%{name}-initrd.config
 %{?with_altconfig:Source3:	%{cfgfile}}
@@ -53,8 +53,11 @@
 Patch6:		%{name}-insmod-morearchs.patch
 Patch7:		%{name}-dhcp.patch
 Patch8:		%{name}-fix_64_archs.patch
+Patch9:		%{name}-LFS.patch
+Patch10:	%{name}-noshadow.patch
 URL:		http://www.busybox.net/
 BuildRequires:	gcc >= 3.2
+BuildRequires:	perl-tools-pod
 %{?with_static:BuildRequires:	glibc-static}
 %if %{with initrd}
 	%if %{with dietlibc}
@@ -82,6 +85,8 @@
 
 %define		_bindir		/bin
 %define		_initrd_bindir	/bin
+# ld is used to link applets
+%define		filterout_ld	-Wl,--as-needed
 
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define CrossOpts CROSS="%{_target_cpu}-pld-linux-"
@@ -157,8 +162,11 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
+install -d built
 %if %{with initrd}
 install %{SOURCE2} .config
 %{__make} oldconfig
@@ -180,7 +188,7 @@
 %endif
 %endif
 
-mv -f busybox busybox.initrd
+mv -f busybox built/busybox.initrd
 %{__make} clean
 %endif
 
@@ -198,7 +206,7 @@
 	CFLAGS_EXTRA="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags} -static" \
 	CC="%{__cc}"
-mv -f busybox busybox.static
+mv -f busybox built/busybox.static
 %{__make} clean
 %endif
 
@@ -208,13 +216,14 @@
 	CFLAGS_EXTRA="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}" \
 	CC="%{__cc}"
+%{__make} busybox.links docs/BusyBox.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_initrd_bindir},%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 
-%{?with_static:install busybox.static $RPM_BUILD_ROOT%{_bindir}}
-%{?with_initrd:install busybox.initrd $RPM_BUILD_ROOT%{_initrd_bindir}/initrd-busybox}
+%{?with_static:install built/busybox.static $RPM_BUILD_ROOT%{_bindir}}
+%{?with_initrd:install built/busybox.initrd $RPM_BUILD_ROOT%{_initrd_bindir}/initrd-busybox}
 
 install busybox.links $RPM_BUILD_ROOT%{_libdir}/busybox
 install docs/BusyBox.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -265,6 +274,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2006/12/30 13:29:30  qboosh
+- updated to 1.3.1, updated configs
+- updated printf-gettext,loadfont,dhcp patches
+- readded LFS patch (only one part left, the rest is obsolete at last)
+- added noshadow patch to fix build without shadow support
+
 Revision 1.120  2006/11/09 17:50:26  qboosh
 - sparc64_fixes patch merged into insmod-morearchs patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/busybox.spec?r1=1.120&r2=1.121&f=u



More information about the pld-cvs-commit mailing list