Remove swap-modules package build

swap-modules package containing modules for all supported targets is
obsolete and it is no longer used. Now each supported device has its
own package.

Change-Id: Ifbada7ada8ec551b48eea6628c6b11caa87ab31f
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/kernel_integration/sync_swap_to_kernel.sh b/kernel_integration/sync_swap_to_kernel.sh
index 2fa5d6d..39223dc 100755 (executable)
--- a/kernel_integration/sync_swap_to_kernel.sh
+++ b/kernel_integration/sync_swap_to_kernel.sh
@@ -146,7 +146,6 @@ check_file() {
        black_files="\
 $SHORT_MODULES_SUBDIR/build.sh \
 $SHORT_MODULES_SUBDIR/build.config.example \
-$SHORT_MODULES_SUBDIR/deploy.sh \
 $SHORT_MODULES_SUBDIR/pack.sh \
 "
 

diff --git a/modules/deploy.sh b/modules/deploy.sh
deleted file mode 100755 (executable)
index 5309f27..0000000
--- a/modules/deploy.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-model=$(sed -n  "s|.*tizen.org/system/model_name[^>]*>\([^<]*\)<.*|\1|p" /etc/config/model-config.xml)
-modpath=/opt/swap/sdk
-
-case $model in
-# armv7l
-       "TM1")
-               mv $modpath/tm1_swap_modules/* $modpath
-               rm -r $modpath/tm1_swap_modules
-               rm -rf $modpath/odroid_swap_modules
-               rm -rf $modpath/tw1_swap_modules
-               ;;
-       "xu3")
-               mv $modpath/odroid_swap_modules/* $modpath
-               rm -r $modpath/odroid_swap_modules
-               rm -rf $modpath/tm1_swap_modules
-               rm -rf $modpath/tw1_swap_modules
-               ;;
-       "TW1")
-               mv $modpath/tw1_swap_modules/* $modpath
-               rm -r $modpath/tw1_swap_modules
-               rm -rf $modpath/odroid_swap_modules
-               rm -rf $modpath/tm1_swap_modules
-               ;;
-# x86
-       "Emulator")
-               mv $modpath/emul_swap_modules/* $modpath
-               rm -r $modpath/emul_swap_modules
-               ;;
-# aarch64
-       "TM2")
-               mv $modpath/tm2_swap_modules/* $modpath
-               rm -r $modpath/tm2_swap_modules
-               rm -rf $modpath/rpi3_swap_modules
-               rm -rf $modpath/tw2_swap_modules
-               ;;
-       "TW2")
-               mv $modpath/tw2_swap_modules/* $modpath
-               rm -r $modpath/tw2_swap_modules
-               rm -rf $modpath/rpi3_swap_modules
-               rm -rf $modpath/tm2_swap_modules
-               ;;
-       "rpi3")
-               mv $modpath/rpi3_swap_modules/* $modpath
-               rm -r $modpath/rpi3_swap_modules
-               rm -rf $modpath/tw2_swap_modules
-               rm -rf $modpath/tm2_swap_modules
-               ;;
-       *)
-               echo "Device isn't supported" > /tmp/swap-modules_install.log
-               ;;
-esac

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index b69905f..456e2ed 100644 (file)
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1,9 +1,5 @@
 arch aarch64 targets armv7l:aarch64
 
-swap-modules
-  post "/opt/swap/sdk/deploy.sh"
-  +/
-
 swap-modules-tm2
   provides "swap-modules"
   provides "swap-modules = %{version}-%{release}"

diff --git a/packaging/swap-modules.spec b/packaging/swap-modules.spec
index 76ec71e..38423fc 100755 (executable)
--- a/packaging/swap-modules.spec
+++ b/packaging/swap-modules.spec
@@ -1,5 +1,3 @@
-%bcond_with emulator
-
 Name: swap-modules
 Version: 3.0
 Release: 1
@@ -8,6 +6,10 @@ Summary: Linux profiler
 Group: System Environment/Kernel
 Vendor: Samsung
 Source: swap-modules-3.0.tar.gz
+Provides: swap-modules
+
+%description
+Kernel modules for SWAP
 
 
 # Setup build config.
@@ -37,161 +39,76 @@ Source: swap-modules-3.0.tar.gz
 %endif
 
 
-Requires: model-config
-
-BuildRequires: perl
-BuildRequires: python
-Provides: swap-modules
-
-%ifarch armv7l
-# TM1
-BuildRequires: kernel-devel-3.10-sc7730
-# Odroid
-BuildRequires: arm-odroidxu3-linux-kernel-devel
-# TW1
-BuildRequires: kernel-devel-3.4-exynos3250
-%else
- %ifarch aarch64
-# RPI3
-BuildRequires: arm64-rpi3-linux-kernel-devel
-# TM2
-BuildRequires: arm64-tm2-linux-kernel-devel
-# TW2
-BuildRequires: kernel-devel-exynos7270-tw2
- %else
-  %ifarch i586 i686
-   %if %{with emulator}
-BuildRequires: emulator-kernel-devel
-   %else
-ExclusiveArch:
-   %endif
-  %else
-ExclusiveArch:
-  %endif
- %endif
-%endif
-
-# # This exclude condition is only for public OBS.
-# %if "%{_repository}" == "arm-wayland" || "%{_repository}" == "arm64-wayland" || "%{_repository}" == "ia32-wayland" || "%{_repository}" == "x86_64-wayland"
-# ExclusiveArch:
-# %endif
-
-
-%description
-Kernel modules for SWAP
-
 %prep
 %setup -q
 
+
 %build
 cd modules
-%ifarch armv7l
-# TM1
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_tm1 --arch arm clean
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_tm1 --arch arm compile
-./pack.sh /tmp/tm1_swap_modules/
-# Odroid
-./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
-./pack.sh /tmp/odroid_swap_modules/
-# TW1
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_wc1 --arch arm clean
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_wc1 --arch arm compile
-./pack.sh /tmp/tw1_swap_modules/
-%else
- %ifarch aarch64
-# RPI3
-./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/rpi3_swap_modules/
-# TM2
-./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-tm2 --arch arm64 clean
-./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-tm2 --arch arm64 compile
-./pack.sh /tmp/tm2_swap_modules/
-# TW2
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tw2 --arch arm64 clean
-./build.sh --kernel /boot/kernel/devel/kernel-devel-tw2 --arch arm64 compile
-./pack.sh /tmp/tw2_swap_modules/
- %else
-  %ifarch i586 i686
-./build.sh --kernel /usr/src/kernel-devel-tizen_emulator --arch i386 clean
-./build.sh --kernel /usr/src/kernel-devel-tizen_emulator --arch i386 compile
-./pack.sh /tmp/emul_swap_modules/
-  %endif
- %endif
-%endif
-
-%install
-mkdir -p %{buildroot}/opt/swap/modules/
 
 %if %{BUILD_PACKAGE_TM1}
- cp -r /tmp/tm1_swap_modules %{buildroot}/opt/swap/modules/tm1
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_tm1 --arch arm clean
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-tizen_tm1 --arch arm compile
+ ./pack.sh /tmp/modules/tm1
 %endif
 
 %if %{BUILD_PACKAGE_TM2}
- cp -r /tmp/tm2_swap_modules %{buildroot}/opt/swap/modules/tm2
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-tm2 --arch arm64 clean
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-arm64-tm2 --arch arm64 compile
+ ./pack.sh /tmp/modules/tm2
 %endif
 
 %if %{BUILD_PACKAGE_TW2}
- cp -r /tmp/tw2_swap_modules %{buildroot}/opt/swap/modules/tw2
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-tw2 --arch arm64 clean
+ ./build.sh --kernel /boot/kernel/devel/kernel-devel-tw2 --arch arm64 compile
+ ./pack.sh /tmp/modules/tw2
 %endif
 
 %if %{BUILD_PACKAGE_RPI3}
- cp -r /tmp/rpi3_swap_modules %{buildroot}/opt/swap/modules/rpi3
+ ./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_ODROIDXU3}
- cp -r /tmp/odroid_swap_modules %{buildroot}/opt/swap/modules/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
+ ./pack.sh /tmp/modules/odroidxu3
 %endif
 
 %if %{BUILD_PACKAGE_EMULATOR32}
- cp -r /tmp/emul_swap_modules %{buildroot}/opt/swap/modules/emulator32
+ ./build.sh --kernel /usr/src/kernel-devel-tizen_emulator --arch i386 clean
+ ./build.sh --kernel /usr/src/kernel-devel-tizen_emulator --arch i386 compile
+ ./pack.sh /tmp/modules/emulator32
 %endif
 
-mkdir -p %{buildroot}/opt/swap/sdk/
-%ifarch armv7l
-mv /tmp/tm1_swap_modules %{buildroot}/opt/swap/sdk/
-mv /tmp/odroid_swap_modules %{buildroot}/opt/swap/sdk/
-mv /tmp/tw1_swap_modules %{buildroot}/opt/swap/sdk/
-%else
- %ifarch aarch64
-mv /tmp/rpi3_swap_modules %{buildroot}/opt/swap/sdk/
-mv /tmp/tm2_swap_modules %{buildroot}/opt/swap/sdk/
-mv /tmp/tw2_swap_modules %{buildroot}/opt/swap/sdk/
- %else
-  %ifarch i586 i686
-mv /tmp/emul_swap_modules %{buildroot}/opt/swap/sdk/
-  %endif
- %endif
+
+%install
+mkdir -p %{buildroot}/opt/swap/modules/
+
+%if %{BUILD_PACKAGE_TM1}
+ mv /tmp/modules/tm1 %{buildroot}/opt/swap/modules/
 %endif
-install -m 770 modules/deploy.sh -t %{buildroot}/opt/swap/sdk
 
+%if %{BUILD_PACKAGE_TM2}
+ mv /tmp/modules/tm2 %{buildroot}/opt/swap/modules/
+%endif
 
-# mkdir -p %{buildroot}/usr/share/license
-# cp LICENSE.GPL-2.0+ %{buildroot}/usr/share/license/%{name}
+%if %{BUILD_PACKAGE_TW2}
+ mv /tmp/modules/tw2 %{buildroot}/opt/swap/modules/
+%endif
 
-%post
-/opt/swap/sdk/deploy.sh
+%if %{BUILD_PACKAGE_RPI3}
+ mv /tmp/modules/rpi3 %{buildroot}/opt/swap/modules/
+%endif
 
-%files
-%license LICENSE.GPL-2.0+
-%defattr(-,root,root)
-%ifarch armv7l
-/opt/swap/sdk/tm1_swap_modules
-/opt/swap/sdk/odroid_swap_modules
-/opt/swap/sdk/tw1_swap_modules
-%else
- %ifarch aarch64
-/opt/swap/sdk/rpi3_swap_modules
-/opt/swap/sdk/tm2_swap_modules
-/opt/swap/sdk/tw2_swap_modules
- %else
-  %ifarch i586 i686
-/opt/swap/sdk/emul_swap_modules
-  %endif
- %endif
+%if %{BUILD_PACKAGE_ODROIDXU3}
+ mv /tmp/modules/odroidxu3 %{buildroot}/opt/swap/modules/
+%endif
+
+%if %{BUILD_PACKAGE_EMULATOR32}
+ mv /tmp/modules/emulator32 %{buildroot}/opt/swap/modules/
 %endif
-/opt/swap/sdk/deploy.sh
 
 
 %if %{BUILD_PACKAGE_TM1}
@@ -199,6 +116,7 @@ install -m 770 modules/deploy.sh -t %{buildroot}/opt/swap/sdk
 Summary: SWAP modules for TM1
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: kernel-devel-3.10-sc7730
 
 %description tm1
 This package provides SWAP modules for TM1
@@ -214,11 +132,13 @@ rm /opt/swap/sdk
 /opt/swap/modules/tm1/
 %endif # BUILD_PACKAGE_TM1
 
+
 %if %{BUILD_PACKAGE_TM2}
 %package tm2
 Summary: SWAP modules for TM2
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: arm64-tm2-linux-kernel-devel
 
 %description tm2
 This package provides SWAP modules for TM2
@@ -234,11 +154,13 @@ rm /opt/swap/sdk
 /opt/swap/modules/tm2/
 %endif # BUILD_PACKAGE_TM2
 
+
 %if %{BUILD_PACKAGE_TW2}
 %package tw2
 Summary: SWAP modules for TW2
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: kernel-devel-exynos7270-tw2
 
 %description tw2
 This package provides SWAP modules for TW2
@@ -254,11 +176,13 @@ rm /opt/swap/sdk
 /opt/swap/modules/tw2/
 %endif # BUILD_PACKAGE_TW2
 
+
 %if %{BUILD_PACKAGE_RPI3}
 %package rpi3
 Summary: SWAP modules for RPI3
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: arm64-rpi3-linux-kernel-devel
 
 %description rpi3
 This package provides SWAP modules for RPI3
@@ -274,11 +198,13 @@ rm /opt/swap/sdk
 /opt/swap/modules/rpi3/
 %endif # BUILD_PACKAGE_RPI3
 
+
 %if %{BUILD_PACKAGE_ODROIDXU3}
 %package odroidxu3
 Summary: SWAP modules for ODROIDXU3
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: arm-odroidxu3-linux-kernel-devel
 
 %description odroidxu3
 This package provides SWAP modules for ODROIDXU3
@@ -294,11 +220,13 @@ rm /opt/swap/sdk
 /opt/swap/modules/odroidxu3/
 %endif # BUILD_PACKAGE_ODROIDXU3
 
+
 %if %{BUILD_PACKAGE_EMULATOR32}
 %package emulator32
 Summary: SWAP modules for Emulator x86
 Provides: swap-modules
 Provides: swap-modules = %{version}-%{release}
+BuildRequires: emulator-kernel-devel
 
 %description emulator32
 This package provides SWAP modules for Emulator x86