From 8f166df294cd06f202526c7e7f73fc0c77876437 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Mon, 24 Mar 2014 14:15:16 +0900 Subject: packaging: change modules directory to /boot/lib/modules This patch changes the default modules directory from /lib/modules to /boot/lib/modules. The mobile kernel didn't use /lib/modules for modules because it should be matched with kernel version and can be recoveried with the /boot directory. The old kernel used modules.img which includes kernel modules. And we also loop-mounted it to the /lib/modules directory. Instead of it, we'll use /boot/lib/ modules directory because it will have same functionality if the /boot directory will be read-only. And we will add the recovery partition of the /boot. Change-Id: Ie0f0af47f0f6d3fe25c780fb8685df745b587dd7 Signed-off-by: Chanho Park --- packaging/linux-kernel.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/linux-kernel.spec b/packaging/linux-kernel.spec index 8ee2d6663b1..389232b1b50 100644 --- a/packaging/linux-kernel.spec +++ b/packaging/linux-kernel.spec @@ -93,8 +93,8 @@ QA_SKIP_BUILD_ROOT="DO_NOT_WANT"; export QA_SKIP_BUILD_ROOT # 1. Destynation directories mkdir -p %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -mkdir -p %{buildroot}/lib/modules/%{fullVersion} mkdir -p %{buildroot}/boot/ +mkdir -p %{buildroot}/boot/lib/modules/%{fullVersion} # 2. Install uImage, System.map, ... install -m 755 arch/arm/boot/uImage %{buildroot}/boot/ @@ -104,7 +104,7 @@ install -m 644 System.map %{buildroot}/boot/System.map-%{fullVersion} install -m 644 .config %{buildroot}/boot/config-%{fullVersion} # 3. Install modules -make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{buildroot} modules_install +make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{buildroot}/boot/ modules_install # 4. Install kernel headers make INSTALL_PATH=%{buildroot} INSTALL_MOD_PATH=%{buildroot} INSTALL_HDR_PATH=%{buildroot}/usr headers_install @@ -158,12 +158,12 @@ rm -rf %{buildroot}/vmlinux* find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/tools/perf/scripts/ -type f %{excluded_files} -exec chmod 755 {} \; find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/scripts/ -type f %{excluded_files} -exec chmod 755 {} \; find %{buildroot}/usr -type f ! -name "check-perf-tracei.pl" -name "*.sh" -name "*.pl" -exec chmod 755 {} \; -find %{buildroot}/lib/modules/ -name "*.ko" -type f -exec chmod 755 {} \; +find %{buildroot}/boot/lib/modules/ -name "*.ko" -type f -exec chmod 755 {} \; # 8. Create symbolic links -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 +rm -f %{buildroot}/boot/lib/modules/%{fullVersion}/build +rm -f %{buildroot}/boot/lib/modules/%{fullVersion}/source +ln -sf /usr/src/linux-kernel-build-%{fullVersion} %{buildroot}/boot/lib/modules/%{fullVersion}/build %clean rm -rf %{buildroot} @@ -175,8 +175,8 @@ rm -rf %{buildroot} %files devel %defattr (-, root, root) /usr/src/linux-kernel-build-%{fullVersion} -/lib/modules/%{fullVersion}/modules.* -/lib/modules/%{fullVersion}/build +/boot/lib/modules/%{fullVersion}/modules.* +/boot/lib/modules/%{fullVersion}/build %files %license COPYING @@ -184,8 +184,8 @@ rm -rf %{buildroot} /boot/*.dtb /boot/System.map* /boot/config* -/lib/modules/%{fullVersion}/kernel -/lib/modules/%{fullVersion}/modules.* +/boot/lib/modules/%{fullVersion}/kernel +/boot/lib/modules/%{fullVersion}/modules.* %files -n perf %license COPYING -- cgit v1.2.3