packaging: rename devel package name without release version

The %{fullVersion} has release version, so it is changed for every
build. It makes difficult to build module with the devel pacakge,
so rename devel directory without the release version.

Note: there is no dependency for current artik devel package.

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

2 files changed, 54 insertions, 54 deletions

diff --git a/packaging/linux-artik530.spec b/packaging/linux-artik530.spec
index 8395acbe5141..d280dd97acc2 100644
--- a/packaging/linux-artik530.spec
+++ b/packaging/linux-artik530.spec
@@ -97,13 +97,13 @@ make dtbs %{?_smp_mflags}
 make modules %{?_smp_mflags}
 
 # 4. Create tar repo for build directory
-tar cpf linux-kernel-build-%{fullVersion}.tar .
+tar cpf linux-kernel-build-%{variant}.tar .
 
 %install
 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}/usr/src/linux-kernel-build-%{variant}
 mkdir -p %{buildroot}/boot/
 mkdir -p %{buildroot}/lib/modules/%{fullVersion}
 
@@ -122,28 +122,28 @@ make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{buildroot} modules_install KERNELREL
 make INSTALL_PATH=%{buildroot} INSTALL_MOD_PATH=%{buildroot} INSTALL_HDR_PATH=%{buildroot}/usr headers_install KERNELRELEASE=%{fullVersion}
 
 # 5. Restore source and build irectory
-tar -xf linux-kernel-build-%{fullVersion}.tar -C %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}
-mv %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/arm .
-mv %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/Kconfig .
-rm -rf %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/*
-mv arm %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/
-mv Kconfig      %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/
+tar -xf linux-kernel-build-%{variant}.tar -C %{buildroot}/usr/src/linux-kernel-build-%{variant}
+mv %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/arm .
+mv %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/Kconfig .
+rm -rf %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/*
+mv arm %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/
+mv Kconfig %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/
 
 # 6. Remove files
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".tmp_vmlinux*" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".gitignore" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".*dtb*tmp" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.*tmp" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "vmlinux" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "zImage" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "test-*" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.cmd" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.ko" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.o" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.S" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.s" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.c" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -size 0c -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".tmp_vmlinux*" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".gitignore" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".*dtb*tmp" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.*tmp" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "vmlinux" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "zImage" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "test-*" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.cmd" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.ko" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.o" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.S" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.s" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.c" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -size 0c -exec rm -f {} \;
 find %{buildroot}/usr/include -name "\.install"  -exec rm -f {} \;
 find %{buildroot}/usr -name "..install.cmd" -exec rm -f {} \;
 
@@ -152,20 +152,20 @@ rm -rf %{buildroot}/vmlinux*
 rm -rf %{buildroot}/lib/firmware
 
 # 6.1 Clean Documentation directory
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/Documentation -type f ! -name "Makefile" ! -name "*.sh" ! -name "*.pl" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant}/Documentation -type f ! -name "Makefile" ! -name "*.sh" ! -name "*.pl" -exec rm -f {} \;
 
 # 7. Update file permisions
 %define excluded_files ! -name "*.h" ! -name "*.cocci" ! -name "*.tst" ! -name "*.y" ! -name "*.in" ! -name "*.gperf" ! -name "*.PL" ! -name "lex*" ! -name "check-perf-tracei.pl" ! -name "*.*shipped" ! -name "*asm-generic" ! -name "Makefile*" ! -name "*.lds" ! -name "mkversion" ! -name "zconf.l" ! -name "README" ! -name "*.py" ! -name "gconf.glade" ! -name "*.cc" ! -name "dbus_contexts" ! -name "*.pm" ! -name "*.xs" ! -name "*.l" ! -name "EventClass.py" ! -name "typemap" ! -name "net_dropmonitor.py"
 
-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/src/linux-kernel-build-%{variant}/tools/perf/scripts/ -type f %{excluded_files} -exec chmod 755 {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant}/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 {} \;
 
 # 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
+ln -sf /usr/src/linux-kernel-build-%{variant} %{buildroot}/lib/modules/%{fullVersion}/build
 
 %clean
 rm -rf %{buildroot}
@@ -175,7 +175,7 @@ rm -rf %{buildroot}
 
 %files -n %{variant}-linux-kernel-devel
 %defattr (-, root, root)
-/usr/src/linux-kernel-build-%{fullVersion}
+/usr/src/linux-kernel-build-%{variant}
 /lib/modules/%{fullVersion}/modules.*
 /lib/modules/%{fullVersion}/build
 
diff --git a/packaging/linux-artik7.spec b/packaging/linux-artik7.spec
index 119aeaf359e1..45f848034afa 100644
--- a/packaging/linux-artik7.spec
+++ b/packaging/linux-artik7.spec
@@ -97,13 +97,13 @@ make dtbs %{?_smp_mflags}
 make modules %{?_smp_mflags}
 
 # 4. Create tar repo for build directory
-tar cpf linux-kernel-build-%{fullVersion}.tar .
+tar cpf linux-kernel-build-%{variant}.tar .
 
 %install
 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}/usr/src/linux-kernel-build-%{variant}
 mkdir -p %{buildroot}/boot/
 mkdir -p %{buildroot}/lib/modules/%{fullVersion}
 
@@ -122,28 +122,28 @@ make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{buildroot} modules_install KERNELREL
 make INSTALL_PATH=%{buildroot} INSTALL_MOD_PATH=%{buildroot} INSTALL_HDR_PATH=%{buildroot}/usr headers_install KERNELRELEASE=%{fullVersion}
 
 # 5. Restore source and build irectory
-tar -xf linux-kernel-build-%{fullVersion}.tar -C %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}
-mv %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/arm64 .
-mv %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/Kconfig .
-rm -rf %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/*
-mv arm64 %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/
-mv Kconfig      %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/arch/
+tar -xf linux-kernel-build-%{variant}.tar -C %{buildroot}/usr/src/linux-kernel-build-%{variant}
+mv %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/arm64 .
+mv %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/Kconfig .
+rm -rf %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/*
+mv arm64 %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/
+mv Kconfig      %{buildroot}/usr/src/linux-kernel-build-%{variant}/arch/
 
 # 6. Remove files
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".tmp_vmlinux*" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".gitignore" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name ".*dtb*tmp" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.*tmp" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "vmlinux" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "Image" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "test-*" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.cmd" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.ko" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.o" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.S" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.s" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -name "*.c" -exec rm -f {} \;
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion} -size 0c -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".tmp_vmlinux*" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".gitignore" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name ".*dtb*tmp" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.*tmp" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "vmlinux" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "Image" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "test-*" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.cmd" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.ko" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.o" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.S" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.s" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -name "*.c" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant} -size 0c -exec rm -f {} \;
 find %{buildroot}/usr/include -name "\.install"  -exec rm -f {} \;
 find %{buildroot}/usr -name "..install.cmd" -exec rm -f {} \;
 
@@ -152,20 +152,20 @@ rm -rf %{buildroot}/vmlinux*
 rm -rf %{buildroot}/lib/firmware
 
 # 6.1 Clean Documentation directory
-find %{buildroot}/usr/src/linux-kernel-build-%{fullVersion}/Documentation -type f ! -name "Makefile" ! -name "*.sh" ! -name "*.pl" -exec rm -f {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant}/Documentation -type f ! -name "Makefile" ! -name "*.sh" ! -name "*.pl" -exec rm -f {} \;
 
 # 7. Update file permisions
 %define excluded_files ! -name "*.h" ! -name "*.cocci" ! -name "*.tst" ! -name "*.y" ! -name "*.in" ! -name "*.gperf" ! -name "*.PL" ! -name "lex*" ! -name "check-perf-tracei.pl" ! -name "*.*shipped" ! -name "*asm-generic" ! -name "Makefile*" ! -name "*.lds" ! -name "mkversion" ! -name "zconf.l" ! -name "README" ! -name "*.py" ! -name "gconf.glade" ! -name "*.cc" ! -name "dbus_contexts" ! -name "*.pm" ! -name "*.xs" ! -name "*.l" ! -name "EventClass.py" ! -name "typemap" ! -name "net_dropmonitor.py"
 
-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/src/linux-kernel-build-%{variant}/tools/perf/scripts/ -type f %{excluded_files} -exec chmod 755 {} \;
+find %{buildroot}/usr/src/linux-kernel-build-%{variant}/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 {} \;
 
 # 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
+ln -sf /usr/src/linux-kernel-build-%{variant} %{buildroot}/lib/modules/%{fullVersion}/build
 
 %clean
 rm -rf %{buildroot}
@@ -175,7 +175,7 @@ rm -rf %{buildroot}
 
 %files -n %{variant}-linux-kernel-devel
 %defattr (-, root, root)
-/usr/src/linux-kernel-build-%{fullVersion}
+/usr/src/linux-kernel-build-%{variant}
 /lib/modules/%{fullVersion}/modules.*
 /lib/modules/%{fullVersion}/build