Changeset 863 for trunk/mindi-busybox


Ignore:
Timestamp:
Oct 2, 2006, 12:26:44 AM (13 years ago)
Author:
bruno
Message:

merge -r838:862 $SVN_M/branches/stable

Location:
trunk/mindi-busybox
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi-busybox/.config

    r822 r863  
    7474CONFIG_AR=y
    7575# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
    76 CONFIG_BUNZIP2=y
     76# CONFIG_BUNZIP2 is not set
    7777CONFIG_CPIO=y
    7878# CONFIG_DPKG is not set
     
    355355# Linux Module Utilities
    356356#
    357 CONFIG_INSMOD=y
     357# CONFIG_INSMOD is not set
    358358# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
    359359# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
     
    361361# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
    362362# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
    363 CONFIG_RMMOD=y
    364 CONFIG_LSMOD=y
    365 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
    366 CONFIG_MODPROBE=y
    367 CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
    368 
    369 #
    370 # Options common to multiple modutils
    371 #
     363# CONFIG_RMMOD is not set
     364# CONFIG_LSMOD is not set
     365# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
     366# CONFIG_MODPROBE is not set
     367# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
    372368# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
    373 CONFIG_FEATURE_2_4_MODULES=y
    374 CONFIG_FEATURE_2_6_MODULES=y
     369# CONFIG_FEATURE_2_4_MODULES is not set
     370# CONFIG_FEATURE_2_6_MODULES is not set
    375371# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
    376372
  • trunk/mindi-busybox/distributions/rpm/mindi-busybox.spec

    r833 r863  
    1111Source:     SSS
    1212BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    13 ExcludeArch: ppc
     13ExcludeArch:    ppc
    1414Conflicts:  busybox
    15 Provides:   busybox
    1615OBS
    1716
     
    2928%{__rm}  -rf $RPM_BUILD_ROOT
    3029
    31 DESTDIR=$RPM_BUILD_ROOT/usr/lib/mindi/rootfs
     30DESTDIR=${RPM_BUILD_ROOT}%{_libdir}/mindi/rootfs
    3231make PREFIX=$DESTDIR install
    3332
Note: See TracChangeset for help on using the changeset viewer.