diff options
author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2024-03-14 11:14:50 +0100 |
---|---|---|
committer | Karol Lewandowski <k.lewandowsk@samsung.com> | 2024-03-14 11:37:06 +0100 |
commit | eea6c53cb6b1762081fa72e3bc67586b14eb4299 (patch) | |
tree | aafe63605c0ca9e591eaa87ef6f9e56e83916b93 | |
parent | 5279379eac7c29d98b9775c477c7a416c293b588 (diff) | |
download | build-accepted/tizen/base/20240502.113322.tar.gz build-accepted/tizen/base/20240502.113322.tar.bz2 build-accepted/tizen/base/20240502.113322.zip |
tizen: Do not include %dir entries in baselibs.conf-generated packageaccepted/tizen/base/20240502.113322
This fixes error while trying to create platform image with packages
generated using baselibs.conf:
INFO: Next install: filesystem
WARNING: file /lib/modules conflicts between attempted installs of linux-tizen-modules-rpi4-aarch64-7.5.0-0.armv7l and filesystem-3.1-1.1.armv7l
ERROR: Could not run transaction.
After this commit original and baselibs.conf-generated package have
the same contents (for tested cases).
Package contents before change:
- original package
$ rpm -qpl linux-tizen-modules-rpi4-7.5.0-0.aarch64.rpm
/lib/modules/5.15.92-arm64-rpi4-v8/extra/kdbus/kdbus.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/logger.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/proc-tsm.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/zlogger/zlogger.ko
/lib/modules/modprobe.d/tizen-modprobe-rpi4.conf
/lib/modules/modules-load.d/tizen-modules-rpi4.conf
/usr/share/licenses/linux-tizen-modules-rpi4
/usr/share/licenses/linux-tizen-modules-rpi4/COPYING
- baselibs.conf-generated package
$ rpm -qpl linux-tizen-modules-rpi4-aarch64-7.5.0-0.armv7l.rpm
/lib/modules
/lib/modules/5.15.92-arm64-rpi4-v8
/lib/modules/5.15.92-arm64-rpi4-v8/extra
/lib/modules/5.15.92-arm64-rpi4-v8/extra/kdbus
/lib/modules/5.15.92-arm64-rpi4-v8/extra/kdbus/kdbus.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/logger.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/proc-tsm.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/zlogger
/lib/modules/5.15.92-arm64-rpi4-v8/extra/zlogger/zlogger.ko
/lib/modules/modprobe.d
/lib/modules/modprobe.d/tizen-modprobe-rpi4.conf
/lib/modules/modules-load.d
/lib/modules/modules-load.d/tizen-modules-rpi4.conf
/usr/share/licenses
/usr/share/licenses/linux-tizen-modules-rpi4
/usr/share/licenses/linux-tizen-modules-rpi4/COPYING
Package contents after change:
- no change to original package
- baselibs.conf-generated package:
$ rpm -qpl linux-tizen-modules-rpi4-aarch64-7.5.0-0.armv7l.rpm
/lib/modules/5.15.92-arm64-rpi4-v8/extra/kdbus/kdbus.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/logger.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/proc-tsm.ko
/lib/modules/5.15.92-arm64-rpi4-v8/extra/zlogger/zlogger.ko
/lib/modules/modprobe.d/tizen-modprobe-rpi4.conf
/lib/modules/modules-load.d/tizen-modules-rpi4.conf
/usr/share/licenses/linux-tizen-modules-rpi4
/usr/share/licenses/linux-tizen-modules-rpi4/COPYING
Change-Id: I22c7bcf13670515568ad01120879161ba86566e4
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
-rwxr-xr-x | mkbaselibs | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -4,6 +4,9 @@ use POSIX; use strict; use File::Temp qw/tempfile tempdir/; +# tizen customization: do not package individual %dirs as these conflict with filesystem package +my $tizen_add_dir_entries_to_package = 0; + # See: http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html#S3-RPM-FILE-FORMAT-HEADER-TAG-LISTING # cf http://search.cpan.org/~davecross/Parse-RPM-Spec-0.01/lib/Parse/RPM/Spec.pm my %STAG = ( @@ -822,8 +825,10 @@ sub handle_rpms { print SPEC "\n%clean\n"; print SPEC "\nrm -rf \$RPM_BUILD_ROOT\n\n"; print SPEC "%files -n $targetname\n"; - for my $file (sort keys %alldirs) { - print SPEC "%dir %attr(0755,root,root) $file\n"; + if ($tizen_add_dir_entries_to_package) { + for my $file (sort keys %alldirs) { + print SPEC "%dir %attr(0755,root,root) $file\n"; + } } for my $file (keys %files) { my $fi = $files{$file}; |