public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Arun Sharma <asharma@fb.com>
To: Michal Marek <mmarek@suse.cz>,
	linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Arun Sharma <asharma@fb.com>
Subject: [PATCH 4/6] kbuild: Move firmware images to a separate RPM
Date: Tue, 17 May 2011 10:36:17 -0700	[thread overview]
Message-ID: <1305653779-3445-4-git-send-email-asharma@fb.com> (raw)
In-Reply-To: <1305653779-3445-1-git-send-email-asharma@fb.com>

This allows multiple kernel RPMs to be installed without
namespace conflicts.

Signed-off-by: Arun Sharma <asharma@fb.com>
---
 scripts/package/mkspec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index c38e950..bf215c5 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -66,6 +66,13 @@ echo "between the Linux kernel and userspace libraries and programs.  The"
 echo "header files define structures and constants that are needed for"
 echo "building most standard programs and are also needed for rebuilding the"
 echo "glibc package."
+echo ""
+echo "%package firmware"
+echo "Summary: Set of firmware images in the kernel tree"
+echo "Group: Development/System"
+echo "%description firmware"
+echo "Firmware images in the kernel tree provided for backward compability"
+echo ""
 
 if ! $PREBUILT; then
 echo "%prep"
@@ -90,6 +97,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
 echo "%endif"
 
 echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
+echo 'make %{?_smp_mflags} INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware KBUILD_SRC= firmware_install'
 echo "%ifarch ia64"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -135,7 +143,6 @@ echo "%files"
 echo '%defattr (-, root, root)'
 echo "%dir /lib/modules"
 echo "/lib/modules/$KERNELRELEASE"
-echo "/lib/firmware"
 echo "/boot/*"
 echo ""
 echo "%files devel"
@@ -146,3 +153,7 @@ echo "%files headers"
 echo '%defattr (-, root, root)'
 echo "/usr/include"
 echo ""
+echo "%files firmware"
+echo '%defattr (-, root, root)'
+echo "/lib/firmware"
+echo ""
-- 
1.7.4


  parent reply	other threads:[~2011-05-17 17:37 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-17 17:36 [PATCH 1/6] kbuild: Integrate with new-kernel-pkg Arun Sharma
2011-05-17 17:36 ` [PATCH 2/6] kbuild: Add a kernel-devel package Arun Sharma
2011-05-25 20:34   ` Arun Sharma
2011-05-17 17:36 ` [PATCH 3/6] kbuild: Create a kernel-headers RPM Arun Sharma
2011-05-24 16:38   ` Michal Marek
2011-05-17 17:36 ` Arun Sharma [this message]
2011-05-25 13:53   ` [PATCH 4/6] kbuild: Move firmware images to a separate RPM Michal Marek
2011-05-17 17:36 ` [PATCH 5/6] kbuild: Append RPM release to $KERNELRELEASE Arun Sharma
2011-05-17 17:46   ` Arun Sharma
2011-05-17 20:13   ` Michal Marek
2011-05-20 20:59     ` Arun Sharma
2011-05-25 20:46     ` Arun Sharma
2011-05-17 17:36 ` [PATCH 6/6] kbuild: cleanup the rpm buildroot Arun Sharma
2011-05-25 13:54   ` Michal Marek
2011-05-25 19:39     ` Arun Sharma
2011-05-17 19:46 ` [PATCH 1/6] kbuild: Integrate with new-kernel-pkg Michal Marek
2011-05-17 20:45   ` Arun Sharma
2011-05-17 21:34     ` Michal Marek
2011-05-17 21:48       ` Arun Sharma
2011-05-25 20:31       ` Arun Sharma

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1305653779-3445-4-git-send-email-asharma@fb.com \
    --to=asharma@fb.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox