summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-11-06 10:12:52 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:19 (GMT)
commit17467540497fd2add65afe47664dd8a648695b4e (patch)
tree986042483ce62c2dc0d46c1cfb1ae0c3bc817610
parent0b330d791b03c7fe7c33911aa4dd8217d7437dd2 (diff)
downloadlinux-3.10-17467540497fd2add65afe47664dd8a648695b4e.zip
linux-3.10-17467540497fd2add65afe47664dd8a648695b4e.tar.gz
linux-3.10-17467540497fd2add65afe47664dd8a648695b4e.tar.bz2
packaging: separate modules.img
This patch separates modules.img from /boot. We'll add a new partition for modules. Change-Id: I50ef63dfebacd389c96d7e012970f1a1e9796125 Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r--packaging/linux-3.10.spec12
-rw-r--r--packaging/odroid-linux-kernel.spec14
-rw-r--r--packaging/rinato-linux-kernel.spec4
3 files changed, 2 insertions, 28 deletions
diff --git a/packaging/linux-3.10.spec b/packaging/linux-3.10.spec
index 9b1a031..bf26f97 100644
--- a/packaging/linux-3.10.spec
+++ b/packaging/linux-3.10.spec
@@ -27,7 +27,6 @@ BuildRequires: flex
BuildRequires: bison
BuildRequires: libdw-devel
BuildRequires: python-devel
-BuildRequires: e2fsprogs >= 1.42.11
%description
The Linux Kernel, the operating system core itself
@@ -194,15 +193,6 @@ rm -f %{buildroot}/lib/modules/%{fullVersion}/build
rm -f %{buildroot}/lib/modules/%{fullVersion}/source
ln -sf /usr/src/linux-kernel-build-%{fullVersion} %{buildroot}/lib/modules/%{fullVersion}/build
-# 9. Calculate modules.img size
-BIN_SIZE=`du -s %{buildroot}/lib/modules | awk {'printf $1;'}`
-let BIN_SIZE=${BIN_SIZE}+1024+512
-
-dd if=/dev/zero of=%{buildroot}/boot/modules.img count=${BIN_SIZE} bs=1024
-/usr/sbin/mke2fs -t ext4 -F -d %{buildroot}/lib/modules/ %{buildroot}/boot/modules.img
-
-rm -rf %{buildroot}/lib/modules/%{fullVersion}/kernel
-
%clean
rm -rf %{buildroot}
@@ -211,7 +201,7 @@ rm -rf %{buildroot}
/usr/include
%files -n %{variant}-linux-kernel-modules
-/boot/modules.img
+/lib/modules/
%files -n %{variant}-linux-kernel-devel
%defattr (-, root, root)
diff --git a/packaging/odroid-linux-kernel.spec b/packaging/odroid-linux-kernel.spec
index eadfb2b..e7d8519 100644
--- a/packaging/odroid-linux-kernel.spec
+++ b/packaging/odroid-linux-kernel.spec
@@ -20,7 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
BuildRequires: module-init-tools
BuildRequires: u-boot-tools
BuildRequires: bc
-BuildRequires: e2fsprogs >= 1.42.11
%description
The Linux Kernel, the operating system core itself
@@ -88,23 +87,12 @@ find %{buildroot}/lib/modules/ -name "*.ko"
# 8. Create symbolic links
rm -f %{buildroot}/lib/modules/%{fullVersion}/build
rm -f %{buildroot}/lib/modules/%{fullVersion}/source
-rm -rf %{buildroot}/lib/modules/%{fullVersion}/modules.*
-rm -rf %{buildroot}/lib/modules/%{fullVersion}/build
-
-# 9. Calculate modules.img size
-BIN_SIZE=`du -s %{buildroot}/lib/modules | awk {'printf $1;'}`
-let BIN_SIZE=${BIN_SIZE}+1024+512
-
-dd if=/dev/zero of=%{buildroot}/boot/modules.img count=${BIN_SIZE} bs=1024
-/usr/sbin/mke2fs -t ext4 -F -d %{buildroot}/lib/modules/ %{buildroot}/boot/modules.img
-
-rm -rf %{buildroot}/lib/modules/%{fullVersion}/kernel
%clean
rm -rf %{buildroot}
%files -n %{variant}-linux-kernel-modules
-/boot/modules.img
+/lib/modules/
%files -n %{variant}-linux-kernel
%license COPYING
diff --git a/packaging/rinato-linux-kernel.spec b/packaging/rinato-linux-kernel.spec
index 2740856..02ca755 100644
--- a/packaging/rinato-linux-kernel.spec
+++ b/packaging/rinato-linux-kernel.spec
@@ -18,7 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
%define fullVersion %{version}-%{variant}
BuildRequires: bc
-BuildRequires: e2fsprogs >= 1.42.11
%description
The Linux Kernel, the operating system core itself
@@ -47,9 +46,6 @@ make %{?_smp_mflags}
make zImage %{?_smp_mflags}
make dtbs %{?_smp_mflags}
-# 3. Build modules
-make modules %{?_smp_mflags}
-
%install
QA_SKIP_BUILD_ROOT="DO_NOT_WANT"; export QA_SKIP_BUILD_ROOT