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

dist: delete kernel-modules-public rpm 

Some customer want install OS from USB card or BMC. OS treat BMC as a
USB storage device. So, do not put usb storage ko in kernel
modules-public-removable-media rpm, delete kernel-modules-public rpm.

More details:
--story=1020422414120102612
--bug=1020426283131556911

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
This commit is contained in:
Jianping Liu 2024-10-16 11:30:23 +08:00
parent bb0729d7db
commit 251e419790
2 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,13 +170,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" /
;;
* ) * )
error "Invalid module packaging param '$1'" error "Invalid module packaging param '$1'"
exit 1 exit 1

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

@ -305,32 +305,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-public-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 devel package ### Kernel devel package
%package devel %package devel
Summary: Development package for building kernel modules to match the %{version}-%{release} kernel Summary: Development package for building kernel modules to match the %{version}-%{release} kernel
@ -1181,21 +1155,9 @@ 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 $?
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
popd popd
# Make these file list usable in rpm build dir # Make these file list usable in rpm build dir
@ -1519,19 +1481,6 @@ fi
%postun modules %postun modules
depmod -a %{kernel_unamer} depmod -a %{kernel_unamer}
### 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}
### Devel package ### Devel package
%post devel %post devel
if [ -f /etc/sysconfig/kernel ]; then if [ -f /etc/sysconfig/kernel ]; then
@ -1596,10 +1545,6 @@ fi
%endif %endif
%defattr(-,root,root) %defattr(-,root,root)
%files modules-public-removable-media -f modules-public-removable-media.list
%files modules-public -f modules-public.list
%if %{with_keypkg} %if %{with_keypkg}
%files signing-keys -f signing-keys.list %files signing-keys -f signing-keys.list
%defattr(-,root,root) %defattr(-,root,root)