From: Karol Lewandowski Date: Fri, 26 Nov 2021 09:35:56 +0000 (+0100) Subject: Keep only source package X-Git-Tag: submit/tizen/20211126.100737^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c261c5bbe651ae11391836fa1f4448eb597dfd1c;p=platform%2Fkernel%2Flinux-tizen-modules-source.git Keep only source package This commit drops all public-tizen customizations and keep only source package generation. Public Tizen linux-tizen-modules will use this package to build code and will add its specific configuration. Change-Id: I633f869530d6b0a34c27ff4d0d137bc7eaac262f --- diff --git a/conf/tizen-modprobe-rpi3.conf b/conf/tizen-modprobe-rpi3.conf deleted file mode 100644 index b65f476..0000000 --- a/conf/tizen-modprobe-rpi3.conf +++ /dev/null @@ -1 +0,0 @@ -options proc-tsm blacklist=System::TEF diff --git a/conf/tizen-modprobe-rpi4.conf b/conf/tizen-modprobe-rpi4.conf deleted file mode 100644 index b65f476..0000000 --- a/conf/tizen-modprobe-rpi4.conf +++ /dev/null @@ -1 +0,0 @@ -options proc-tsm blacklist=System::TEF diff --git a/conf/tizen-modprobe-tw3.conf b/conf/tizen-modprobe-tw3.conf deleted file mode 100644 index b65f476..0000000 --- a/conf/tizen-modprobe-tw3.conf +++ /dev/null @@ -1 +0,0 @@ -options proc-tsm blacklist=System::TEF diff --git a/conf/tizen-modules-rpi3.conf b/conf/tizen-modules-rpi3.conf deleted file mode 100644 index 7c82fcf..0000000 --- a/conf/tizen-modules-rpi3.conf +++ /dev/null @@ -1 +0,0 @@ -logger diff --git a/conf/tizen-modules-rpi4.conf b/conf/tizen-modules-rpi4.conf deleted file mode 100644 index 7c82fcf..0000000 --- a/conf/tizen-modules-rpi4.conf +++ /dev/null @@ -1 +0,0 @@ -logger diff --git a/conf/tizen-modules-tw3.conf b/conf/tizen-modules-tw3.conf deleted file mode 100644 index 7c82fcf..0000000 --- a/conf/tizen-modules-tw3.conf +++ /dev/null @@ -1 +0,0 @@ -logger diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf deleted file mode 100644 index 126c8ea..0000000 --- a/packaging/baselibs.conf +++ /dev/null @@ -1,13 +0,0 @@ -arch aarch64 targets armv7l:aarch64 - -linux-tizen-modules-tw3 - +/ - requires "bash" - requires "coreutils" - requires "findutils" - requires "kmod-compat" - provides "stability-monitor-kernel-module" - post "/bin/cp -r /aarch64/modules/* /lib/modules/" - post "/bin/rm -rf /aarch64" - post "RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`))" - post "/sbin/depmod -a $RELEASEVERSION" diff --git a/packaging/linux-tizen-modules-source.manifest b/packaging/linux-tizen-modules-source.manifest new file mode 100644 index 0000000..a76fdba --- /dev/null +++ b/packaging/linux-tizen-modules-source.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/linux-tizen-modules-source.spec b/packaging/linux-tizen-modules-source.spec index aa45713..1209d30 100644 --- a/packaging/linux-tizen-modules-source.spec +++ b/packaging/linux-tizen-modules-source.spec @@ -1,9 +1,9 @@ Name: linux-tizen-modules-source -Version: 7.0.1 +Version: 7.0.2 Release: 0 License: GPL-2.0+ Source0: %{name}-%{version}.tar.xz -Source1: linux-tizen-modules.manifest +Source1: %{name}.manifest Summary: Source code for Tizen-specific kernel modules Group: System/Kernel %description @@ -21,7 +21,7 @@ mkdir -p %{buildroot}/usr/src/%{name} cp kernel/*.[ch] kernel/Makefile COPYING %{buildroot}/usr/src/%{name} %files -%manifest linux-tizen-modules.manifest +%manifest %{name}.manifest %license COPYING /usr/src/%{name}/COPYING /usr/src/%{name}/*.c diff --git a/packaging/linux-tizen-modules.manifest b/packaging/linux-tizen-modules.manifest deleted file mode 100644 index a76fdba..0000000 --- a/packaging/linux-tizen-modules.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/linux-tizen-modules.spec b/packaging/linux-tizen-modules.spec deleted file mode 100644 index 13a41cc..0000000 --- a/packaging/linux-tizen-modules.spec +++ /dev/null @@ -1,138 +0,0 @@ -%define KMOD_PATH /lib/modules/ - -%ifarch aarch64 -%define buildarch arm64 -%else -%define buildarch arm -%endif - -Name: linux-tizen-modules -Version: 7.0.1 -Release: 0 -License: GPL-2.0+ -Source0: %{name}-%{version}.tar.xz -Source1: %{name}.manifest -Summary: Tizen-specific kernel modules -Group: System/Kernel -ExclusiveArch: armv7l aarch64 -BuildRequires: kmod -BuildRequires: %{buildarch}-rpi3-linux-kernel-devel -BuildRequires: %{buildarch}-rpi4-linux-kernel-devel -%ifarch aarch64 -BuildRequires: kernel-devel-exynos9110-tw3 -%endif -%description - -%package rpi3 -Summary: Tizen modules for RaspberryPI 3 -AutoReqProv: no -Requires: %{buildarch}-rpi3-linux-kernel-modules -Requires(post): bash -Requires(post): coreutils -Requires(post): findutils -Requires(post): kmod-compat -Provides: stability-monitor-kernel-module -%description rpi3 - -%package rpi4 -Summary: Tizen modules for RaspberryPI 4 -AutoReqProv: no -Requires: %{buildarch}-rpi4-linux-kernel-modules -Requires(post): bash -Requires(post): coreutils -Requires(post): findutils -Requires(post): kmod-compat -Provides: stability-monitor-kernel-module -%description rpi4 - -%ifarch aarch64 -%package tw3 -Summary: Tizen modules for TW3 -AutoReqProv: no -Provides: stability-monitor-kernel-module -%description tw3 -%endif - -%prep -%setup -q -cp %{SOURCE1} ./%{name}.manifest - -%build -export BUILD_logger=m -export BUILD_proc_tsm=m - -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3/ -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi3 INSTALL_MOD_STRIP=1 - -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4 -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-%{buildarch}-rpi4 INSTALL_MOD_STRIP=1 - -%ifarch aarch64 -make -C kernel clean KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 -make -C kernel KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 -make -C kernel modules_install KERNELDIR=/boot/kernel/devel/kernel-devel-tw3 INSTALL_MOD_STRIP=1 -%endif - -%install -mkdir -p %{buildroot}/%{KMOD_PATH} - -pushd lib/modules -find -name "*.ko" -exec cp -a --parents {} %{buildroot}/%{KMOD_PATH}/ \; -popd - -# module load config -mkdir -p %{buildroot}/%{KMOD_PATH}/modprobe.d -install -m 644 conf/tizen-modprobe-rpi3.conf %{buildroot}/%{KMOD_PATH}/modprobe.d -install -m 644 conf/tizen-modprobe-rpi4.conf %{buildroot}/%{KMOD_PATH}/modprobe.d - -mkdir -p %{buildroot}/%{KMOD_PATH}/modules-load.d -install -m 644 conf/tizen-modules-rpi3.conf %{buildroot}/%{KMOD_PATH}/modules-load.d -install -m 644 conf/tizen-modules-rpi4.conf %{buildroot}/%{KMOD_PATH}/modules-load.d - -%ifarch aarch64 -mkdir -p %{buildroot}/aarch64/modules -mv %{buildroot}/%{KMOD_PATH}/4.9.59 %{buildroot}/aarch64/modules/ - -mkdir -p %{buildroot}/aarch64/modules/modprobe.d -install -m 644 conf/tizen-modprobe-tw3.conf %{buildroot}/aarch64/modules/modprobe.d - -mkdir -p %{buildroot}/aarch64/modules/modules-load.d -install -m 644 conf/tizen-modules-tw3.conf %{buildroot}/aarch64/modules/modules-load.d -%endif - -%clean -rm -rf %{buildroot} -rm -rf %{_builddir}/%{name}-%{version}/lib - -%post rpi3 -RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) -/sbin/depmod -a $RELEASEVERSION - -%post rpi4 -RELEASEVERSION=$(basename $(dirname `find /lib/modules -name extra | head -1`)) -/sbin/depmod -a $RELEASEVERSION - -%files rpi3 -%manifest %{name}.manifest -%license COPYING -%{KMOD_PATH}/*rpi3*/extra -%{KMOD_PATH}/modprobe.d/tizen-modprobe-rpi3.conf -%{KMOD_PATH}/modules-load.d/tizen-modules-rpi3.conf - -%files rpi4 -%manifest %{name}.manifest -%license COPYING -%{KMOD_PATH}/*rpi4*/extra -%{KMOD_PATH}/modprobe.d/tizen-modprobe-rpi4.conf -%{KMOD_PATH}/modules-load.d/tizen-modules-rpi4.conf - -%ifarch aarch64 -%files tw3 -%manifest %{name}.manifest -%license COPYING -/aarch64/modules/4.9.59/extra -/aarch64/modules/modprobe.d/tizen-modprobe-tw3.conf -/aarch64/modules/modules-load.d/tizen-modules-tw3.conf -%endif