Hello community, here is the log from the commit of package microos-tools for openSUSE:Factory checked in at 2020-11-02 09:40:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/microos-tools (Old) and /work/SRC/openSUSE:Factory/.microos-tools.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools" Mon Nov 2 09:40:34 2020 rev:13 rq:844898 version:2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes 2020-10-26 16:07:50.054468894 +0100 +++ /work/SRC/openSUSE:Factory/.microos-tools.new.3463/microos-tools.changes 2020-11-02 09:40:41.945627526 +0100 @@ -1,0 +2,12 @@ +Wed Oct 28 10:43:48 UTC 2020 - Thorsten Kukuk <ku...@suse.com> + +- Update to version 2.7 + - Add workaround if /.autorelabel is used, don't ignore it +- Rename tmp.conf to microos-tmp.conf on SUSE MicroOS + +------------------------------------------------------------------- +Thu Oct 22 13:04:15 UTC 2020 - Thorsten Kukuk <ku...@suse.com> + +- Fix building on SUSE MicroOS + +------------------------------------------------------------------- Old: ---- microos-tools-2.6.tar.xz tmp.conf New: ---- microos-tmp.conf microos-tools-2.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microos-tools.spec ++++++ --- /var/tmp/diff_new_pack.1h1Ww5/_old 2020-11-02 09:40:43.145628677 +0100 +++ /var/tmp/diff_new_pack.1h1Ww5/_new 2020-11-02 09:40:43.145628677 +0100 @@ -17,7 +17,7 @@ Name: microos-tools -Version: 2.6 +Version: 2.7 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later @@ -25,7 +25,7 @@ URL: https://github.com/kubic-project/microos-tools Source: microos-tools-%{version}.tar.xz Source1: tmp.mount -Source2: tmp.conf +Source2: microos-tmp.conf Source99: microos-tools-rpmlintrc BuildRequires: distribution-release BuildRequires: pkgconfig @@ -48,6 +48,7 @@ %make_install %if 0%{?suse_version} <= 1500 install -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/ +install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} %endif %pre @@ -94,7 +95,7 @@ %{_bindir}/locale-check %if 0%{?suse_version} <= 1500 %{_unitdir}/tmp.mount -%{_tmpfilesdir}/tmp.conf +%{_tmpfilesdir}/microos-tmp.conf %endif %changelog ++++++ microos-tmp.conf ++++++ # This file is part of systemd. # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # See tmpfiles.d(5) for details # Clear tmp directories separately, to make them easier to override d /tmp 1777 root root 10d ++++++ microos-tools-2.6.tar.xz -> microos-tools-2.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-2.6/NEWS new/microos-tools-2.7/NEWS --- old/microos-tools-2.6/NEWS 2020-10-21 17:45:51.000000000 +0200 +++ new/microos-tools-2.7/NEWS 2020-10-28 11:42:09.000000000 +0100 @@ -1,3 +1,6 @@ +Version 2.7 + - Add workaround if /.autorelabel is used, don't ignore it. + Version 2.6 - Don't delete autorelabel file in initrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-2.6/configure new/microos-tools-2.7/configure --- old/microos-tools-2.6/configure 2020-10-21 17:53:44.000000000 +0200 +++ new/microos-tools-2.7/configure 2020-10-28 11:42:13.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for microos-tools 2.6. +# Generated by GNU Autoconf 2.69 for microos-tools 2.7. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='microos-tools' PACKAGE_TARNAME='microos-tools' -PACKAGE_VERSION='2.6' -PACKAGE_STRING='microos-tools 2.6' +PACKAGE_VERSION='2.7' +PACKAGE_STRING='microos-tools 2.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1238,7 +1238,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures microos-tools 2.6 to adapt to many kinds of systems. +\`configure' configures microos-tools 2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of microos-tools 2.6:";; + short | recursive ) echo "Configuration of microos-tools 2.7:";; esac cat <<\_ACEOF @@ -1407,7 +1407,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -microos-tools configure 2.6 +microos-tools configure 2.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1462,7 +1462,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by microos-tools $as_me 2.6, which was +It was created by microos-tools $as_me 2.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2325,7 +2325,7 @@ # Define the identity of the package. PACKAGE='microos-tools' - VERSION='2.6' + VERSION='2.7' cat >>confdefs.h <<_ACEOF @@ -4264,7 +4264,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by microos-tools $as_me 2.6, which was +This file was extended by microos-tools $as_me 2.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4321,7 +4321,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -microos-tools config.status 2.6 +microos-tools config.status 2.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-2.6/configure.ac new/microos-tools-2.7/configure.ac --- old/microos-tools-2.6/configure.ac 2020-10-21 17:46:06.000000000 +0200 +++ new/microos-tools-2.7/configure.ac 2020-10-28 11:41:23.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(microos-tools, 2.6) +AC_INIT(microos-tools, 2.7) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-2.6/selinux/98selinux-microos/selinux-microos-relabel.sh new/microos-tools-2.7/selinux/98selinux-microos/selinux-microos-relabel.sh --- old/microos-tools-2.6/selinux/98selinux-microos/selinux-microos-relabel.sh 2020-10-21 17:42:07.000000000 +0200 +++ new/microos-tools-2.7/selinux/98selinux-microos/selinux-microos-relabel.sh 2020-10-28 14:45:06.000000000 +0100 @@ -2,8 +2,8 @@ rd_microos_relabel() { - # If SELinux is disabled exit now - getarg "selinux=0" > /dev/null && return 0 + # If SELinux is not enabled exit now + getarg "selinux=1" > /dev/null || return 0 SELINUX="enforcing" [ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config" @@ -35,7 +35,8 @@ #LANG=C /usr/sbin/setenforce 0 info "SELinux: mount root read-write and relabel" mount -o remount,rw "$NEWROOT" - LANG=C chroot "$NEWROOT" /sbin/restorecon -R -e /var/lib/overlay -e /sys -e /dev -e /run / + FORCE=$(cat "$NEWROOT"/etc/selinux/.autorelabel) + LANG=C chroot "$NEWROOT" /sbin/restorecon $FORCE -R -e /var/lib/overlay -e /sys -e /dev -e /run / mount -o remount,ro "$NEWROOT" fi fi @@ -46,12 +47,17 @@ fi done + # Marker when we had relabelled the filesystem + > "$NEWROOT"/etc/selinux/.relabelled + return $ret fi } +test -e "$NEWROOT"/.autorelabel -a "$NEWROOT"/.autorelabel -nt "$NEWROOT"/etc/selinux/.relabelled && (cp -a "$NEWROOT"/.autorelabel "$NEWROOT"/etc/selinux/.autorelabel; rm -f "$NEWROOT"/.autorelabel 2>/dev/null || true ) + if test -f "$NEWROOT"/etc/selinux/.autorelabel; then - rd_microos_relabel + rd_microos_relabel elif getarg "autorelabel" > /dev/null; then rd_microos_relabel fi
