Add the swap-modules-rpi3 package build for 32-bit arm

Currently, only arm64 build for rpi3 is supported, but rpi3
kernel also support 32-bit arm. To support the 32-bit kernel,
add the swap-modules-rpi3 package build for 32-bit arm.

Note: new arm built rpm is named with arm arch name because
already existing arm64 built, arm repackaged rpm file name has
aarch64 arch like swap-modules-rpi3-aarch64.

Change-Id: Ica1ab4c28f6bbc71e1fb69bc4c2e3f5b39250a44
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/packaging/swap-modules.spec b/packaging/swap-modules.spec
index 758f676c941359da39df73637138dc0fd8b842a2..37b0a09b6f96cfe24fe31d5a04d41122e7e352d5 100755 (executable)
--- a/packaging/swap-modules.spec
+++ b/packaging/swap-modules.spec
@@ -21,7 +21,8 @@ Kernel modules for SWAP
 %define BUILD_PACKAGE_TM2 1
 %define BUILD_PACKAGE_TW2 1
 %define BUILD_PACKAGE_TW3 1
-%define BUILD_PACKAGE_RPI3 1
+%define BUILD_PACKAGE_RPI3_ARM64 1
+%define BUILD_PACKAGE_RPI3_ARM32 1
 %define BUILD_PACKAGE_ODROIDXU3 1
 %define BUILD_PACKAGE_EMULATOR32 1
 
@@ -34,12 +35,13 @@ Kernel modules for SWAP
 %ifnarch %arm
  %define BUILD_PACKAGE_TM1 0
  %define BUILD_PACKAGE_ODROIDXU3 0
+ %define BUILD_PACKAGE_RPI3_ARM32 0
 %endif
 %ifnarch aarch64
  %define BUILD_PACKAGE_TM2 0
  %define BUILD_PACKAGE_TW2 0
  %define BUILD_PACKAGE_TW3 0
- %define BUILD_PACKAGE_RPI3 0
+ %define BUILD_PACKAGE_RPI3_ARM64 0
 %endif
 %if ! %{with emulator}
  %define BUILD_PACKAGE_EMULATOR32 0
@@ -77,12 +79,18 @@ cd modules
  ./pack.sh /tmp/modules/tw3
 %endif
 
-%if %{BUILD_PACKAGE_RPI3}
+%if %{BUILD_PACKAGE_RPI3_ARM64}
  ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-rpi3 --arch arm64 clean
  ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-rpi3 --arch arm64 compile
  ./pack.sh /tmp/modules/rpi3
 %endif
 
+%if %{BUILD_PACKAGE_RPI3_ARM32}
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm-rpi3 --arch arm clean
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm-rpi3 --arch arm compile
+ ./pack.sh /tmp/modules/rpi3-arm32
+%endif
+
 %if %{BUILD_PACKAGE_ODROIDXU3}
  ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm-odroidxu3 --arch arm clean
  ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm-odroidxu3 --arch arm compile
@@ -115,10 +123,14 @@ mkdir -p %{buildroot}/opt/swap/modules/
  mv /tmp/modules/tw3 %{buildroot}/opt/swap/modules/
 %endif
 
-%if %{BUILD_PACKAGE_RPI3}
+%if %{BUILD_PACKAGE_RPI3_ARM64}
  mv /tmp/modules/rpi3 %{buildroot}/opt/swap/modules/
 %endif
 
+%if %{BUILD_PACKAGE_RPI3_ARM32}
+ mv /tmp/modules/rpi3-arm32 %{buildroot}/opt/swap/modules/
+%endif
+
 %if %{BUILD_PACKAGE_ODROIDXU3}
  mv /tmp/modules/odroidxu3 %{buildroot}/opt/swap/modules/
 %endif
@@ -216,7 +228,7 @@ rm /opt/swap/sdk
 %endif # BUILD_PACKAGE_TW3
 
 
-%if %{BUILD_PACKAGE_RPI3}
+%if %{BUILD_PACKAGE_RPI3_ARM64}
 %package rpi3
 Summary: SWAP modules for RPI3
 Provides: swap-modules
@@ -235,7 +247,29 @@ rm /opt/swap/sdk
 %files rpi3
 %license LICENSE.GPL-2.0+
 /opt/swap/modules/rpi3/
-%endif # BUILD_PACKAGE_RPI3
+%endif # BUILD_PACKAGE_RPI3_ARM64
+
+
+%if %{BUILD_PACKAGE_RPI3_ARM32}
+%package rpi3-arm
+Summary: SWAP modules for RPI3
+Provides: swap-modules
+Provides: swap-modules = %{version}-%{release}
+BuildRequires: arm-rpi3-linux-kernel-devel
+
+%description rpi3-arm
+This package provides SWAP modules for RPI3
+
+%post rpi3-arm
+ln -s /opt/swap/modules/rpi3-arm32 /opt/swap/sdk
+
+%preun rpi3-arm
+rm /opt/swap/sdk
+
+%files rpi3-arm
+%license LICENSE.GPL-2.0+
+/opt/swap/modules/rpi3-arm32/
+%endif # BUILD_PACKAGE_RPI3_ARM32
 
 
 %if %{BUILD_PACKAGE_ODROIDXU3}