builder: Update link to templates to use https
resolves: RHEL-94873
This commit is contained in:
Richard W.M. Jones
parent
28e0146240
commit
1663b01889
@ -0,0 +1,33 @@
|
||||
From bf4fef4f2b45a2016c42094f8e4fe18abc8d90e2 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Wed, 21 May 2025 15:02:44 +0100
|
||||
Subject: [PATCH] docs: Move release note about GNU gettext to build section
|
||||
|
||||
Fixes: commit 9b7410c220f1111e6acef88efbbaee3fea4019b8
|
||||
Updates: commit 80ce443e5eb7323e9b7b5cef30b8f7673ca51d67
|
||||
---
|
||||
docs/guestfs-tools-release-notes-1.54.pod | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/docs/guestfs-tools-release-notes-1.54.pod b/docs/guestfs-tools-release-notes-1.54.pod
|
||||
index b44eb19a2..ab9062303 100644
|
||||
--- a/docs/guestfs-tools-release-notes-1.54.pod
|
||||
+++ b/docs/guestfs-tools-release-notes-1.54.pod
|
||||
@@ -78,6 +78,8 @@ Some deprecated autoconf macros are no longer used.
|
||||
|
||||
Fix some issues when building on macOS (Mohamed Akram).
|
||||
|
||||
+Fix compatibility with GNU gettext 0.25.
|
||||
+
|
||||
=head2 Internals
|
||||
|
||||
The tests were modified to use a set of common functions and remove
|
||||
@@ -87,8 +89,6 @@ nbdkit.
|
||||
Some internal OCaml List and String functions that we used have been
|
||||
replaced by ones from the OCaml stdlib, reducing code maintenance.
|
||||
|
||||
-Fix compatibility with GNU gettext 0.25.
|
||||
-
|
||||
=head2 Bugs fixed
|
||||
|
||||
=begin comment
|
||||
123
0002-builder-Build-fedora-42-template.patch
Normal file
123
0002-builder-Build-fedora-42-template.patch
Normal file
@ -0,0 +1,123 @@
|
||||
From bbc262b2166f226937d4331ac80b631cab7c1129 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Sat, 24 May 2025 13:27:00 +0100
|
||||
Subject: [PATCH] builder: Build fedora-42 template
|
||||
|
||||
Thanks: Jeff Layton
|
||||
---
|
||||
builder/templates/fedora-42.index-fragment | 22 +++++++++
|
||||
builder/templates/fedora-42.ks | 48 ++++++++++++++++++++
|
||||
builder/templates/fedora-42.virt-install-cmd | 20 ++++++++
|
||||
3 files changed, 90 insertions(+)
|
||||
create mode 100644 builder/templates/fedora-42.index-fragment
|
||||
create mode 100644 builder/templates/fedora-42.ks
|
||||
create mode 100644 builder/templates/fedora-42.virt-install-cmd
|
||||
|
||||
diff --git a/builder/templates/fedora-42.index-fragment b/builder/templates/fedora-42.index-fragment
|
||||
new file mode 100644
|
||||
index 000000000..6d21b742c
|
||||
--- /dev/null
|
||||
+++ b/builder/templates/fedora-42.index-fragment
|
||||
@@ -0,0 +1,22 @@
|
||||
+[fedora-42]
|
||||
+name=Fedora® 42 Server
|
||||
+osinfo=fedora42
|
||||
+arch=x86_64
|
||||
+file=fedora-42.xz
|
||||
+checksum[sha512]=dda921f3c522da8d8a67e31948260f52a9aa5bdeca4382a5c557635d77ad91d11b9aded70a225f59503b268ec73815ceac2eac5b70c1d47f22056febdd9da6bb
|
||||
+format=raw
|
||||
+size=6442450944
|
||||
+compressed_size=927728896
|
||||
+expand=/dev/sda3
|
||||
+notes=Fedora® 42 Server
|
||||
+
|
||||
+ This Fedora image contains only unmodified @Core group packages.
|
||||
+
|
||||
+ Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
|
||||
+ Source and further information is available from http://fedoraproject.org/
|
||||
+
|
||||
+ This template was generated by a script in the libguestfs source tree:
|
||||
+ builder/templates/make-template.ml
|
||||
+ Associated files used to prepare this template can be found in the
|
||||
+ same directory.
|
||||
+
|
||||
diff --git a/builder/templates/fedora-42.ks b/builder/templates/fedora-42.ks
|
||||
new file mode 100644
|
||||
index 000000000..17e2e3f15
|
||||
--- /dev/null
|
||||
+++ b/builder/templates/fedora-42.ks
|
||||
@@ -0,0 +1,48 @@
|
||||
+# Kickstart file for fedora-42
|
||||
+# Generated by libguestfs.git/builder/templates/make-template.ml
|
||||
+
|
||||
+text
|
||||
+reboot
|
||||
+lang en_US.UTF-8
|
||||
+keyboard us
|
||||
+network --bootproto dhcp
|
||||
+rootpw builder
|
||||
+firewall --enabled --ssh
|
||||
+timezone --utc America/New_York
|
||||
+selinux --enforcing
|
||||
+
|
||||
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH"
|
||||
+
|
||||
+
|
||||
+zerombr
|
||||
+clearpart --all --initlabel --disklabel=gpt
|
||||
+autopart --type=plain
|
||||
+
|
||||
+# Halt the system once configuration has finished.
|
||||
+poweroff
|
||||
+
|
||||
+%packages
|
||||
+@core
|
||||
+%end
|
||||
+
|
||||
+%post
|
||||
+# Ensure the installation is up-to-date.
|
||||
+dnf -y --best upgrade
|
||||
+# This required otherwise the kernel will not be bootable, see
|
||||
+# https://bugzilla.redhat.com/show_bug.cgi?id=1911177
|
||||
+# https://bugzilla.redhat.com/show_bug.cgi?id=1945835#c24
|
||||
+grub2-mkconfig -o '/etc/grub2.cfg'
|
||||
+# Enable Xen domU support.
|
||||
+pushd /etc/dracut.conf.d
|
||||
+echo 'add_drivers+=" xen:vbd xen:vif "' > virt-builder-xen-drivers.conf
|
||||
+popd
|
||||
+# To make dracut config changes permanent, we need to rerun dracut.
|
||||
+# Rerun dracut for the installed kernel (not the running kernel).
|
||||
+# See commit 0fa52e4e45d80874bc5ea5f112f74be1d3f3472f and
|
||||
+# https://www.redhat.com/archives/libguestfs/2014-June/thread.html#00045
|
||||
+KERNEL_VERSION="$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n' |
|
||||
+ sort -V | tail -1)"
|
||||
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
|
||||
+%end
|
||||
+
|
||||
+# EOF
|
||||
diff --git a/builder/templates/fedora-42.virt-install-cmd b/builder/templates/fedora-42.virt-install-cmd
|
||||
new file mode 100644
|
||||
index 000000000..2a3256bbd
|
||||
--- /dev/null
|
||||
+++ b/builder/templates/fedora-42.virt-install-cmd
|
||||
@@ -0,0 +1,20 @@
|
||||
+# This is the virt-install command which was used to create
|
||||
+# the virt-builder template 'fedora-42'
|
||||
+# NB: This file is generated for documentation purposes ONLY!
|
||||
+# This script was never run, and is not intended to be run.
|
||||
+
|
||||
+'virt-install' \
|
||||
+ '--transient' \
|
||||
+ '--name=tmp-oeg15xnl' \
|
||||
+ '--ram=4096' \
|
||||
+ '--arch=x86_64' \
|
||||
+ '--cpu=host' \
|
||||
+ '--vcpus=4' \
|
||||
+ '--os-variant=fedora34' \
|
||||
+ '--initrd-inject=fedora-42.ks' \
|
||||
+ '--extra-args=inst.ks=file:/fedora-42.ks console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \
|
||||
+ '--disk=/home/rjones/d/guestfs-tools/builder/templates/tmp-oeg15xnl.img,size=6,format=raw' \
|
||||
+ '--location=https://lon.mirror.rackspace.com/fedora/releases/42/Server/x86_64/os/' \
|
||||
+ '--serial=pty' \
|
||||
+ '--nographics'
|
||||
+
|
||||
22
0003-builder-Update-link-to-templates-to-use-https.patch
Normal file
22
0003-builder-Update-link-to-templates-to-use-https.patch
Normal file
@ -0,0 +1,22 @@
|
||||
From 5a2458f38d40e5c6f3eceb8e7de162724ff9e374 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 3 Jun 2025 08:29:57 +0100
|
||||
Subject: [PATCH] builder: Update link to templates to use https
|
||||
|
||||
Fixes: https://issues.redhat.com/browse/RHEL-94873
|
||||
Reported-by: Xiang Hua Chen
|
||||
---
|
||||
builder/libguestfs.conf.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in
|
||||
index 8d8feab75..08b6a6234 100644
|
||||
--- a/builder/libguestfs.conf.in
|
||||
+++ b/builder/libguestfs.conf.in
|
||||
@@ -1,5 +1,5 @@
|
||||
[libguestfs.org]
|
||||
-uri=http://builder.libguestfs.org/index.asc
|
||||
+uri=https://builder.libguestfs.org/index.asc
|
||||
gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/libguestfs.gpg
|
||||
|
||||
[archive.libguestfs.org]
|
||||
@ -1,4 +1,4 @@
|
||||
From 2823717ec8b87fd32559c78c4bcf467ba7227cb5 Mon Sep 17 00:00:00 2001
|
||||
From 38a47670f0699232cd040e7cffa2c815a69531c3 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 7 Jul 2015 09:28:03 -0400
|
||||
Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for
|
||||
@ -1,4 +1,4 @@
|
||||
From feb0d416355753832f3af160d31092e0e7f37e67 Mon Sep 17 00:00:00 2001
|
||||
From 0e49c685d5176879d83cfd7c89ceb4901ca3b90c Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 21 Nov 2022 13:03:22 +0000
|
||||
Subject: [PATCH] RHEL: builder: Disable opensuse repository
|
||||
@ -16,7 +16,7 @@
|
||||
Summary: Tools to access and modify virtual machine disk images
|
||||
Name: guestfs-tools
|
||||
Version: 1.54.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||
|
||||
# Build only for architectures that have a kernel
|
||||
@ -45,8 +45,11 @@ Source3: copy-patches.sh
|
||||
# https://github.com/rwmjones/guestfs-tools/commits/rhel-10.1
|
||||
|
||||
# Patches.
|
||||
Patch0001: 0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
|
||||
Patch0002: 0002-RHEL-builder-Disable-opensuse-repository.patch
|
||||
Patch0001: 0001-docs-Move-release-note-about-GNU-gettext-to-build-se.patch
|
||||
Patch0002: 0002-builder-Build-fedora-42-template.patch
|
||||
Patch0003: 0003-builder-Update-link-to-templates-to-use-https.patch
|
||||
Patch0004: 0004-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
|
||||
Patch0005: 0005-RHEL-builder-Disable-opensuse-repository.patch
|
||||
|
||||
# Basic build requirements.
|
||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
@ -400,13 +403,15 @@ end
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 21 2025 Richard W.M. Jones <rjones@redhat.com> - 1.54.0-1
|
||||
* Tue Jun 10 2025 Richard W.M. Jones <rjones@redhat.com> - 1.54.0-2
|
||||
- Rebase to guestfs-tools 1.54.0
|
||||
resolves: RHEL-81734
|
||||
- virt-builder, virt-v2v & other tools with -v and --install causes dnf5 error
|
||||
resolves: RHEL-83201
|
||||
- virt-drivers fails on opensuse guest if kernel-source is installed
|
||||
resolves: RHEL-92604
|
||||
- builder: Update link to templates to use https
|
||||
resolves: RHEL-94873
|
||||
|
||||
* Wed Oct 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1.52.2-2
|
||||
- Rebase to guestfs-tools 1.52.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user