UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'frankjpliu/master' into 'master' (merge request !87) 

dist: not split out modules-public and modules-public-removable-media rpm
This commit is contained in:
leonylgao 2024-05-09 10:41:17 +00:00
parent e806fb8c8f f67246a0d7
commit dea53117e5
2 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/sources/filter-modules.sh vendored
View File

@ -172,13 +172,6 @@ case $MODULEPKG in
# Now process the override list to bring those modules back into core # Now process the override list to bring those modules back into core
filter_override "$overrides" filter_override "$overrides"
;; ;;
modules-public-removable-media )
# Filter all mods under /lib/modules/$kver/kernel/drivers/usb/storage
filter_mods "drivers/usb/" "storage" /
;;
modules-public )
filter_mods "drivers/gpu/drm/" "nouveau" /
;;
modules-private ) modules-private )
filter_mods "" "$privatemods" / filter_mods "" "$privatemods" /
;; ;;

54
dist/templates/kernel.template.spec vendored
View File

@ -259,32 +259,6 @@ Requires(postun): kmod
%description modules %description modules
This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package. This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package.
### Kernel removable media module package
%package modules-public-removable-media
Summary: %{rpm_vendor} Kernel removable modules to match the %{rpm_name}-core kernel
Provides: installonlypkg(kernel-module-removable-media)
Requires: %{rpm_name} = %{version}-%{release}
AutoReq: no
AutoProv: yes
Requires(pre): kmod
Requires(postun): kmod
%description modules-public-removable-media
This package provides drivers for removable media, e.g. USB disks and CD-ROM,
for %{name} of version %{version}-%{release}.
### Kernel module public package
%package modules-public
Summary: %{rpm_vendor} Kernel modules public to match the %{rpm_name}-core kernel
Provides: installonlypkg(kernel-module-public)
Requires: %{rpm_name} = %{version}-%{release}
AutoReq: no
AutoProv: yes
Requires(pre): kmod
Requires(postun): kmod
%description modules-public
This package provides drivers for public release, e.g. nouveau.ko,
for %{name} of version %{version}-%{release}.
### Kernel module private package ### Kernel module private package
%package modules-private %package modules-private
Summary: %{rpm_vendor} Kernel modules private to match the %{rpm_name}-core kernel Summary: %{rpm_vendor} Kernel modules private to match the %{rpm_name}-core kernel
@ -1100,24 +1074,12 @@ CollectKernelFile() {
# Rest of the modules stay in core package # Rest of the modules stay in core package
%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" non-core-modules >> modules.list || exit $? %SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" non-core-modules >> modules.list || exit $?
# Do module splitting for removable-media-modules
%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-public-removable-media >> modules-public-removable-media.list || exit $?
# Do module splitting for public release modules
%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-public >> modules-public.list || exit $?
# Do module splitting for public release modules # Do module splitting for public release modules
%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-private >> modules-private.list || exit $? %SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-private >> modules-private.list || exit $?
comm -23 core.list modules.list > core.list.tmp comm -23 core.list modules.list > core.list.tmp
mv core.list.tmp core.list mv core.list.tmp core.list
comm -23 core.list modules-public-removable-media.list > core.list.tmp
mv core.list.tmp core.list
comm -23 core.list modules-public.list > core.list.tmp
mv core.list.tmp core.list
comm -23 core.list modules-private.list > core.list.tmp comm -23 core.list modules-private.list > core.list.tmp
mv core.list.tmp core.list mv core.list.tmp core.list
@ -1289,18 +1251,6 @@ fi
depmod -a %{kernel_unamer} depmod -a %{kernel_unamer}
### Module package ### Module package
%post modules-public-removable-media
depmod -a %{kernel_unamer}
%postun modules-public-removable-media
depmod -a %{kernel_unamer}
%post modules-public
depmod -a %{kernel_unamer}
%postun modules-public
depmod -a %{kernel_unamer}
%post modules-private %post modules-private
depmod -a %{kernel_unamer} depmod -a %{kernel_unamer}
@ -1364,10 +1314,6 @@ fi
%files modules -f modules.list %files modules -f modules.list
%defattr(-,root,root) %defattr(-,root,root)
%files modules-public-removable-media -f modules-public-removable-media.list
%files modules-public -f modules-public.list
%files modules-private -f modules-private.list %files modules-private -f modules-private.list
%if %{with_keypkg} %if %{with_keypkg}