Compare commits
3 Commits
00cd494600
...
918689d7ad
Author | SHA1 | Date |
---|---|---|
Brian C. Lane | 918689d7ad | |
Brian C. Lane | 95d984f81d | |
Brian C. Lane | 982d982516 |
|
@ -4,3 +4,4 @@ clog
|
||||||
/lorax-templates-rhel-9.0-35.tar.gz
|
/lorax-templates-rhel-9.0-35.tar.gz
|
||||||
/lorax-templates-rhel-9.0-36.tar.gz
|
/lorax-templates-rhel-9.0-36.tar.gz
|
||||||
/lorax-templates-rhel-9.0-37.tar.gz
|
/lorax-templates-rhel-9.0-37.tar.gz
|
||||||
|
/lorax-templates-rhel-9.0-38.tar.gz
|
||||||
|
|
|
@ -312,7 +312,7 @@ removefrom util-linux --allbut \
|
||||||
/etc/mtab /etc/pam.d/login /etc/pam.d/remote \
|
/etc/mtab /etc/pam.d/login /etc/pam.d/remote \
|
||||||
/usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \
|
/usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \
|
||||||
/usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \
|
/usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \
|
||||||
/usr/bin/{logger,hexdump,flock,lscpu,chmem,lsmem}
|
/usr/bin/{logger,hexdump,flock,lscpu,chmem,lsmem,setpriv}
|
||||||
removefrom volume_key-libs /usr/share/locale/*
|
removefrom volume_key-libs /usr/share/locale/*
|
||||||
removefrom wget /etc/* /usr/share/locale/*
|
removefrom wget /etc/* /usr/share/locale/*
|
||||||
removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
|
removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
Name: lorax-templates-rhel
|
Name: lorax-templates-rhel
|
||||||
Version: 9.0
|
Version: 9.0
|
||||||
Release: 37%{?dist}
|
Release: 38%{?dist}
|
||||||
Summary: RHEL8 build templates for lorax and livemedia-creator
|
Summary: RHEL8 build templates for lorax and livemedia-creator
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/weldr/lorax
|
URL: https://github.com/weldr/lorax
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Source0: lorax-templates-rhel-9.0-37.tar.gz
|
Source0: lorax-templates-rhel-9.0-38.tar.gz
|
||||||
|
|
||||||
# Required for the template branding support
|
# Required for the template branding support
|
||||||
Requires: lorax >= 34.9.1
|
Requires: lorax >= 34.9.1
|
||||||
|
@ -34,6 +34,12 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
|
||||||
%{templatedir}/*
|
%{templatedir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 03 2023 Brian C. Lane <bcl@redhat.com> - 9.0-38
|
||||||
|
- tools: Add support for Jira RHEL-XXX issues (bcl)
|
||||||
|
Related: RHEL-15122
|
||||||
|
- Add setpriv as ostree containers dependency (bcl)
|
||||||
|
Resolves: RHEL-15122
|
||||||
|
|
||||||
* Wed Jan 11 2023 Brian C. Lane <bcl@redhat.com> - 9.0-37
|
* Wed Jan 11 2023 Brian C. Lane <bcl@redhat.com> - 9.0-37
|
||||||
- rsyslog.conf: Set WorkDirectory to /var/lib/rsyslog (bcl)
|
- rsyslog.conf: Set WorkDirectory to /var/lib/rsyslog (bcl)
|
||||||
Resolves: rhbz#2160070
|
Resolves: rhbz#2160070
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (lorax-templates-rhel-9.0-37.tar.gz) = 96d642b6d6ba13021863bef2df27c6644b3af93840f1356287cad8814953e85cdedb649ebbb6e6d2b67dc31bfd323926404344d165eb85645cf0117c6f7b1fa4
|
SHA512 (lorax-templates-rhel-9.0-38.tar.gz) = 0a9435fcd45b8cdae5a6104cef25ec89bdeb1d466df23d47b74f36cd741af8421cb40bf0db8c2682fff2ec35e6c5cc9a27768f38abdb4e7d1aea7ec78911f5ce
|
||||||
|
|
|
@ -65,13 +65,14 @@ class ChangeLog:
|
||||||
# summary line format is ^.*#([0-9]+).*
|
# summary line format is ^.*#([0-9]+).*
|
||||||
# Make sure the bz# isn't likely to be a github issue
|
# Make sure the bz# isn't likely to be a github issue
|
||||||
for line in msg:
|
for line in msg:
|
||||||
m = re.match(r"^(Resolves|Related|Conflicts):\ +rhbz#(\d+)", line)
|
m = re.match(r"^(Resolves|Related|Conflicts):\ +(rhbz#|RHEL-)(\d+)", line)
|
||||||
if m and m.group(1) and m.group(2):
|
if m and m.group(1) and m.group(2) and m.group(3):
|
||||||
bugs.append((m.group(1), m.group(2)))
|
bugs.append((m.group(1), m.group(2), m.group(3)))
|
||||||
else:
|
else:
|
||||||
|
# Assume summary line references are still rhbz# only
|
||||||
m = re.match(r"^.*#(\d+).*", line)
|
m = re.match(r"^.*#(\d+).*", line)
|
||||||
if m and m.group(1) and int(m.group(1)) > 100000:
|
if m and m.group(1) and int(m.group(1)) > 100000:
|
||||||
bugs.append(("Resolves", m.group(1)))
|
bugs.append(("Resolves", "rhbz#", m.group(1)))
|
||||||
|
|
||||||
return bugs
|
return bugs
|
||||||
|
|
||||||
|
@ -99,8 +100,8 @@ class ChangeLog:
|
||||||
author = self._getCommitDetail(commit, "%aE")
|
author = self._getCommitDetail(commit, "%aE")
|
||||||
|
|
||||||
msg = ["%s (%s)" % (summary.strip(), author)]
|
msg = ["%s (%s)" % (summary.strip(), author)]
|
||||||
for r, bz in self.getBugs(long):
|
for r, kind, bz in self.getBugs(long):
|
||||||
msg.append("%s: rhbz#%s" % (r, bz))
|
msg.append("%s: %s%s" % (r, kind, bz))
|
||||||
log.append(msg)
|
log.append(msg)
|
||||||
|
|
||||||
return log
|
return log
|
||||||
|
|
Loading…
Reference in New Issue