Changeset 863 in MondoRescue for trunk/mindi-busybox

Timestamp:

Oct 2, 2006, 12:26:44 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r838:862 $SVN_M/branches/stable

Location:

trunk/mindi-busybox

Files:

• .config (modified) (3 diffs)
• distributions/rpm/mindi-busybox.spec (modified) (2 diffs)

trunk/mindi-busybox/.config

@@ -74 +74 @@
 CONFIG_AR=y
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
+# CONFIG_BUNZIP2 is not set
 CONFIG_CPIO=y
 # CONFIG_DPKG is not set
@@ -355 +355 @@
 # Linux Module Utilities
 #
-CONFIG_INSMOD=y
+# CONFIG_INSMOD is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
@@ -361 +361 @@
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-
-#
-# Options common to multiple modutils
-#
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-CONFIG_FEATURE_2_4_MODULES=y
-CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_2_6_MODULES is not set
 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
 

trunk/mindi-busybox/distributions/rpm/mindi-busybox.spec

@@ -11 +11 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-ExcludeArch: ppc
+ExcludeArch:    ppc
 Conflicts:  busybox
-Provides:   busybox
 OBS
 
@@ -29 +28 @@
 %{__rm}  -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT/usr/lib/mindi/rootfs
+DESTDIR=${RPM_BUILD_ROOT}%{_libdir}/mindi/rootfs
 make PREFIX=$DESTDIR install