diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-02-26 15:51:36 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-02-26 15:51:36 -0800 |
| commit | d84c9d4d1d53307cc0635eceeb6ead2450a30b5c (patch) | |
| tree | 0780da0cea074913dc123e2c1878613eb355597f /scripts | |
| parent | c56cd2af5b273034fb4c96e96fcc06350e84ea85 (diff) | |
| parent | 451d6c90002c8630f86dfc60df0ec17bd73fd77a (diff) | |
| download | history-d84c9d4d1d53307cc0635eceeb6ead2450a30b5c.tar.gz | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/README.Menuconfig | 2 | ||||
| -rw-r--r-- | scripts/mkspec | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/scripts/README.Menuconfig b/scripts/README.Menuconfig index 75add2468d872..89ec0f24e14f2 100644 --- a/scripts/README.Menuconfig +++ b/scripts/README.Menuconfig @@ -127,7 +127,7 @@ The windowing utility, lxdialog, will only be rebuilt if your kernel source tree is fresh, or changes are patched into it via a kernel patch or you do 'make mrproper'. If changes to lxdialog are patched in, most likely the rebuild time will be short. You may force a -complete rebuild of lxdialog by changing to it's directory and doing +complete rebuild of lxdialog by changing to its directory and doing 'make clean all' If you use Menuconfig in an XTERM window make sure you have your diff --git a/scripts/mkspec b/scripts/mkspec index 57c9bc420c2c3..c8795d20fde91 100644 --- a/scripts/mkspec +++ b/scripts/mkspec @@ -45,24 +45,18 @@ echo "%prep" echo "%setup -q" echo "" echo "%build" -# This is the first 'disagreement' between x86 and other archs. -if [ $PC = 1 ]; then - echo "make oldconfig dep clean bzImage modules" -else - echo "make oldconfig dep clean vmlinux modules" -fi -# Back on track +echo "make clean oldconfig all" echo "" echo "%install" echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules' echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install' -# And that's the second +# This is the first disagreement between i386 and most others if [ $PC = 1 ]; then echo 'cp arch/i386/boot/bzImage $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" else echo 'cp vmlinux $RPM_BUILD_ROOT'"/boot/vmlinux-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" fi -# Back on track, again +# Back on track echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo "" |