Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2026-10-20 12:36:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Tue Oct 20 12:36:45 2026 rev:60 rq:1386262 version:1.85 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2026-01-26 10:43:07.209731685 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new.3698736/os-prober.changes 2026-10-20 12:37:17.682942403 +0200 @@ -1,0 +2,10 @@ +Sun Oct 18 11:06:40 UTC 2026 - Martin Pluskal <[email protected]> + +- Update to version 1.85: + * Detect Windows 12 via refactored version matching in 20microsoft. + * Make the EFI locale check locale-independent (LC_ALL=C). + * Install path made usrmerge-compliant; support the noudeb profile. +- All 25 SUSE patches still apply cleanly, no rebasing needed. +- Spec cleanup: drop Group tag, pkgconfig(udev), use %make_build. + +------------------------------------------------------------------- Old: ---- os-prober-1.81.tar.bz2 New: ---- os-prober-1.85.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.S9dYCL/_old 2026-10-20 12:37:19.607023059 +0200 +++ /var/tmp/diff_new_pack.S9dYCL/_new 2026-10-20 12:37:19.610023185 +0200 @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,10 @@ Name: os-prober -Version: 1.81 +Version: 1.85 Release: 0 Summary: Probes disks on the system for installed operating systems License: GPL-2.0-or-later -Group: System/Boot URL: https://salsa.debian.org/installer-team/os-prober Source0: https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source1: COPYING-note.txt @@ -81,10 +80,10 @@ Requires: /bin/sed Requires: /sbin/modprobe Requires: coreutils -Requires: udev Requires: util-linux -Suggests: lvm2 +Requires: pkgconfig(udev) Suggests: btrfsprogs +Suggests: lvm2 %if 0%{?suse_version} >= 1315 # For logger utility Requires: util-linux-systemd @@ -101,7 +100,7 @@ find . -name \*.orig -delete %build -make %{?_smp_mflags} CC="gcc" CFLAGS="%{optflags}" +%make_build CC="gcc" CFLAGS="%{optflags}" %install install -m 0755 -d %{buildroot}%{_bindir} @@ -123,7 +122,7 @@ %ifarch sparc sparc64 ARCH=sparc %endif -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 ARCH=x86 %endif @@ -141,7 +140,6 @@ fi %files -%defattr(-,root,root,-) %doc README TODO debian/copyright debian/changelog COPYING-note.txt %{_bindir}/* %{_prefix}/lib/linux-boot-probes ++++++ os-prober-1.81.tar.bz2 -> os-prober-1.85.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/common.sh new/os-prober-1.85/common.sh --- old/os-prober-1.81/common.sh 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/common.sh 2026-07-30 14:28:07.000000000 +0200 @@ -97,7 +97,7 @@ fi [ -d "$2" ] || return 1 # find files with any case - ls -1 "$2" | grep $q -i "^$1$" + LC_ALL=C ls -1 "$2" | grep $q -i "^$1$" } # We can't always tell the filesystem type up front, but if we have the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/.gitlab-ci.yml new/os-prober-1.85/debian/.gitlab-ci.yml --- old/os-prober-1.81/debian/.gitlab-ci.yml 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -build: - stage: build - - before_script: - - apt update && apt -y install devscripts git-buildpackage - - mk-build-deps --tool "apt -y -o Debug::pkgProblemResolver=yes --no-install-recommends" --install -r debian/control - - script: - - git checkout $CI_COMMIT_REF_NAME - - git pull - - gbp buildpackage -uc -us --git-ignore-branch - - mkdir build - - mv ../*.udeb build/ - - artifacts: - paths: - - build/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/changelog new/os-prober-1.85/debian/changelog --- old/os-prober-1.81/debian/changelog 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/changelog 2026-07-30 14:28:07.000000000 +0200 @@ -1,3 +1,40 @@ +os-prober (1.85) unstable; urgency=medium + + * Team upload + + * Make sure, that the grep call for finding /boot/efi/EFI is locale- + independent (add "LC_ALL=C"). Closes: #1142788. + + -- Holger Wansing <[email protected]> Thu, 30 Jul 2026 14:26:34 +0200 + +os-prober (1.84) unstable; urgency=medium + + * Team upload + + * Change install path, to make package usrmerge-compliant. + + -- Holger Wansing <[email protected]> Tue, 25 Nov 2025 22:56:51 +0100 + +os-prober (1.83) unstable; urgency=medium + + [ Matthias Klose ] + * Support the noudeb profile (closes: #983325). + + -- Colin Watson <[email protected]> Wed, 28 Aug 2024 11:16:14 +0100 + +os-prober (1.82) unstable; urgency=medium + + * Team upload + + [ Philip Hands ] + * Switch to using default branch2repo for salsa-CI. + * Refactor windows version detection (+ adding ver 12). + + [ Samuel Thibault ] + * Make gbp tag produce the right tag format. + + -- Holger Wansing <[email protected]> Thu, 06 Jun 2024 22:08:08 +0200 + os-prober (1.81) unstable; urgency=medium * Team upload diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/control new/os-prober-1.85/debian/control --- old/os-prober-1.81/debian/control 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/control 2026-07-30 14:28:07.000000000 +0200 @@ -10,6 +10,7 @@ Package: os-prober-udeb Package-Type: udeb +Build-Profiles: <!noudeb> Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, di-utils-mapdevfs, anna, grub-mount-udeb [linux-any kfreebsd-any] Provides: os-prober diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/gbp.conf new/os-prober-1.85/debian/gbp.conf --- old/os-prober-1.81/debian/gbp.conf 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/gbp.conf 2026-07-30 14:28:07.000000000 +0200 @@ -1,2 +1,2 @@ -[buildpackage] +[DEFAULT] debian-tag=%(version)s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/os-prober-udeb.install new/os-prober-1.85/debian/os-prober-udeb.install --- old/os-prober-1.81/debian/os-prober-udeb.install 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/os-prober-udeb.install 2026-07-30 14:28:07.000000000 +0200 @@ -1,3 +1,3 @@ -os-prober linux-boot-prober bin +os-prober linux-boot-prober usr/bin newns usr/lib/os-prober common.sh usr/share/os-prober diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/rules new/os-prober-1.85/debian/rules --- old/os-prober-1.81/debian/rules 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/debian/rules 2026-07-30 14:28:07.000000000 +0200 @@ -5,6 +5,10 @@ %: dh $@ +ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES))) + with_udeb = yes +endif + ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) ifneq (,$(filter i386 amd64,$(ARCH))) ARCH=x86 @@ -39,4 +43,6 @@ ifeq ($(ARCH),x86) dh_install os-probes/mounted/powerpc/20macosx usr/lib/os-probes/mounted endif +ifeq ($(with_udeb),yes) cp -a debian/os-prober-udeb/usr/lib debian/os-prober/usr/ +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/debian/salsa-ci.yml new/os-prober-1.85/debian/salsa-ci.yml --- old/os-prober-1.81/debian/salsa-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/os-prober-1.85/debian/salsa-ci.yml 2026-07-30 14:28:07.000000000 +0200 @@ -0,0 +1,3 @@ +--- +include: + - https://salsa.debian.org/installer-team/branch2repo/raw/main/trigger_b2r.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober-1.81/os-probes/mounted/x86/20microsoft new/os-prober-1.85/os-probes/mounted/x86/20microsoft --- old/os-prober-1.81/os-probes/mounted/x86/20microsoft 2022-07-18 15:15:33.000000000 +0200 +++ new/os-prober-1.85/os-probes/mounted/x86/20microsoft 2026-07-30 14:28:07.000000000 +0200 @@ -7,6 +7,12 @@ mpoint="$2" type="$3" +# this function interleaves a string with dots, thus: +# "Windows 11" --> "W.i.n.d.o.w.s. .1.1" +dotify() { + echo $1 | sed 's/./&./g;s/.$//' +} + # This script looks for legacy BIOS bootloaders only. Skip if running UEFI if [ -d /sys/firmware/efi ] && [ ! -f /var/lib/partman/ignore_uefi ]; then debug "Skipping legacy bootloaders on UEFI system" @@ -31,31 +37,20 @@ for boot in $(item_in_dir boot "$2"); do bcd=$(item_in_dir bcd "$2/$boot") if [ -n "$bcd" ]; then - if grep -aqs "W.i.n.d.o.w.s. .1.1" "$2/$boot/$bcd"; then - long="Windows 11" - elif grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd"; then - long="Windows 10" - elif grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then - long="Windows 8" - elif grep -aqs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then - long="Windows 7" - elif grep -aqs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then - long="Windows Vista" - elif grep -aqs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then - long="Windows Server 2008 R2" - elif grep -aqs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then - long="Windows Server 2008" - elif grep -aqs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then - long="Windows Recovery Environment" - elif grep -aqs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then - long="Windows Recovery Environment" - else - long="Windows Vista" - fi - short=Windows - found=true + short=Windows + for v in 12 11 10 8 7 Vista "Server 2008 R2" "Server 2008" "Recovery Environment" "Setup"; do + win_v="Windows $v" + if grep -aqs "$(dotify "$win_v")" "$2/$boot/$bcd"; then + long="$win_v" + # Windows Setup is a special case, rename it: + [ "$v" != "Setup" ] || long="Windows Recovery Environment" + break + fi + done + # if no match found, call it Vista + : ${long:="Windows Vista"} break fi done
