Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nvidia-jetson for openSUSE:Factory checked in at 2024-12-11 21:03:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvidia-jetson (Old) and /work/SRC/openSUSE:Factory/.nvidia-jetson.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvidia-jetson" Wed Dec 11 21:03:42 2024 rev:4 rq:1229934 version:36.4.0_20240912212859 Changes: -------- --- /work/SRC/openSUSE:Factory/nvidia-jetson/nvidia-jetson.changes 2024-10-28 15:23:36.867692476 +0100 +++ /work/SRC/openSUSE:Factory/.nvidia-jetson.new.29675/nvidia-jetson.changes 2024-12-11 21:08:08.342493371 +0100 @@ -1,0 +2,49 @@ +Tue Dec 3 21:27:52 UTC 2024 - Stefan Dirsch <[email protected]> + +- updated URL in specfiel to Jetpack 6.1/36.4.0 + +------------------------------------------------------------------- +Thu Nov 21 03:32:28 UTC 2024 - Stefan Dirsch <[email protected]> + +- using the offical macros apparently doesn't work, so try it + the hard way in %post: + /usr/bin/systemctl preset load-nvidia-drm-${flavor}.service + +------------------------------------------------------------------- +Thu Nov 21 02:39:59 UTC 2024 - Stefan Dirsch <[email protected]> + +- make use of %systemd_post, %systemd_postun_with_restart and + %systemd_preun in %post, %postun and %preun in order to enable + load-nvidia-drm-${flavor} service according to service preset + +------------------------------------------------------------------- +Wed Nov 20 12:04:51 UTC 2024 - Stefan Dirsch <[email protected]> + +- run '/sbin/modinfo' instead of just 'modinfo' in the hope that + the command is found now + +------------------------------------------------------------------- +Wed Nov 20 05:36:00 UTC 2024 - Stefan Dirsch <[email protected]> + +- extra subpackage + * fixed module names in dracut.conf.d snippets by making use + of 'modinfo -F name' ("-" vs. "_" in module and file names) +- added kmod to Buildrequires for the above + +------------------------------------------------------------------- +Wed Nov 20 05:00:51 UTC 2024 - Stefan Dirsch <[email protected]> + +- extra subpackage + * blacklist snd-soc-tegra-audio-graph-card kernel module + * fixed syntax of 'omit_drivers+=' dracut.conf.d snippet lines + in order to really exclude kernel mdoules from initrd now + * also exclude 'tegra-drm' module from initrd + +------------------------------------------------------------------- +Mon Nov 4 14:41:10 UTC 2024 - Stefan Dirsch <[email protected]> + +- modprobe.d snippet: + * reload tegra_drm also on sle15-sp6, since on some AGP system + this is also needed + +------------------------------------------------------------------- New: ---- kmp-preun.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvidia-jetson.spec ++++++ --- /var/tmp/diff_new_pack.v9Aj0P/_old 2024-12-11 21:08:09.410537923 +0100 +++ /var/tmp/diff_new_pack.v9Aj0P/_new 2024-12-11 21:08:09.414538090 +0100 @@ -30,13 +30,14 @@ Summary: Open-Source NVIDIA Jetson Orin graphics drivers License: GPL-2.0-only AND MIT Group: System/Kernel -URL: https://developer.nvidia.com/embedded/jetson-linux-r363 +URL: https://developer.nvidia.com/embedded/jetson-linux-r3640 Source0: nvidia-oot-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 Source1: kmp-post-extra.sh Source2: kmp-postun-extra.sh Source3: kmp-filelist Source4: kmp-post.sh Source5: kmp-postun.sh +Source6: kmp-preun.sh Source7: preamble Source8: kmp-filelist-extra Source9: preamble-extra @@ -62,6 +63,7 @@ BuildRequires: gcc-c++ BuildRequires: kernel-source BuildRequires: kernel-syms +BuildRequires: kmod BuildRequires: perl-Bootloader BuildRequires: pesign-obs-integration BuildRequires: pkgconfig(systemd) @@ -71,7 +73,7 @@ %if 0%{!?kmp_template_name:1} %define kmp_template_name /usr/lib/rpm/kernel-module-subpackage %endif -%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun.sh' %kmp_template_name >%_builddir/nvidia-kmp-template) +%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun.sh' -e '/^%%preun\>/ r %_sourcedir/kmp-preun.sh' %kmp_template_name >%_builddir/nvidia-kmp-template) %(sed -e '/^%%post\>/ r %_sourcedir/kmp-post-extra.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun-extra.sh' %kmp_template_name >%_builddir/nvidia-kmp-extra-template) %kernel_module_package -n %{name}-36_4 -t %_builddir/nvidia-kmp-template -f %_sourcedir/kmp-filelist -p %_sourcedir/preamble %kernel_module_package -n %{name}-36_4-extra -t %_builddir/nvidia-kmp-extra-template -f %_sourcedir/kmp-filelist-extra -p %_sourcedir/preamble-extra @@ -168,13 +170,13 @@ ### Using systemd service file for loading "nvidia-drm" doesn't ### work on SLE Micro 6.0 for some reason, but apparently this ### line helps -%if 0%{?suse_version} == 1600 + ### Update: On some sle15-sp6 AGP system this extra line is also needed cat >> $MODPROBE_DIR/50-nvidia-$flavor.conf << EOF install nvidia /sbin/rmmod tegra_drm; /sbin/modprobe --ignore-install nvidia; /sbin/modprobe tegra_drm EOF -%endif cat > $MODPROBE_DIR/50-nvidia-extra-$flavor.conf << EOF blacklist dwmac_tegra +blacklist snd-soc-tegra-audio-graph-card EOF mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d dracutfile=%{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-jetson-36_4-$flavor.conf @@ -190,12 +192,9 @@ drivers=$(find %{buildroot}/lib/modules/*-${flavor}/updates -name "*.ko*"|grep -v -E "nvidia-drm.ko|nvidia-modeset.ko|nvidia.ko") %endif for driver in ${drivers}; do - dname=$(basename $driver|sed 's/.ko.*//g') - if [ "$dname" == "tegra-drm" ]; then - echo "add_drivers+=${dname}" >> ${dracutfile_extra} - else - echo "omit_drivers+=${dname}" >> ${dracutfile_extra} - fi + #dname=$(basename $driver|sed 's/.ko.*//g') + dname=$(/sbin/modinfo -F name $driver) + echo "omit_drivers+=\" ${dname} \"" >> ${dracutfile_extra} done mkdir -p %{buildroot}/usr/lib/systemd/system install -m 644 %{SOURCE10} %{buildroot}/usr/lib/systemd/system/load-nvidia-drm-$flavor.service ++++++ kmp-post.sh ++++++ --- /var/tmp/diff_new_pack.v9Aj0P/_old 2024-12-11 21:08:09.534543096 +0100 +++ /var/tmp/diff_new_pack.v9Aj0P/_new 2024-12-11 21:08:09.538543263 +0100 @@ -21,4 +21,8 @@ sed -i "s/modeset=1/modeset=0/" /lib/modprobe.d/50-nvidia-$flavor.conf fi +# Preset the service to follow the system's policy +%systemd_post load-nvidia-drm-${flavor}.service +# the official way above doesn't seem to work ;-( +/usr/bin/systemctl preset load-nvidia-drm-${flavor}.service ++++++ kmp-postun.sh ++++++ --- /var/tmp/diff_new_pack.v9Aj0P/_old 2024-12-11 21:08:09.570544598 +0100 +++ /var/tmp/diff_new_pack.v9Aj0P/_new 2024-12-11 21:08:09.574544765 +0100 @@ -1,5 +1,10 @@ +flavor=%1 + if [ "$1" = 0 ] ; then # cleanup of bnc# 1000625 rm -f /usr/lib/tmpfiles.d/nvidia-logind-acl-trick-G06.conf fi +# Cleanup after uninstallation +%systemd_postun_with_restart load-nvidia-drm-${flavor}.service + ++++++ kmp-preun.sh ++++++ flavor=%1 # Stop and disable the service before removal %systemd_preun load-nvidia-drm-${flavor}.service
