diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2003-02-23 22:46:59 -0800 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2003-02-23 22:46:59 -0800 |
| commit | 1ceb967fa8ef3f184c7e53d6b67581118e8968a6 (patch) | |
| tree | 4a012f45d1b1fd3e9244d246d3f8f0a091be25f8 /scripts | |
| parent | 7cfa0dcdc09e1ca1946a8fbbc65c964e9e956561 (diff) | |
[PATCH] fix make rpm
make rpm has been broken in several kernel versions, fix it. Solves
http://bugme.osdl.org/show_bug.cgi?id=373 which Paolo Ciarrocchi pushed
me to fix.
1) Moved make rpm to the noconfig section, thus allowing it to see
the clean target.
2) Fixed the commandline for find
3) Use rpmbuild if present
4) In mkspec use the generic all target, and drop the dep target
This made the build command arch independent
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mkspec | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/scripts/mkspec b/scripts/mkspec index 57c9bc420c2c..c8795d20fde9 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 "" |