upgrade to 33.6
This commit is contained in:
zhangqiumiao
parent
713bf69975
commit
6139941b0f
@ -9,7 +9,7 @@ Subject: [PATCH] add text mode selection menu in grub configuration
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg
|
||||
index 2f6fedb..a779fe7 100644
|
||||
|
||||
--- a/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg
|
||||
+++ b/share/templates.d/99-generic/config_files/aarch64/grub2-efi.cfg
|
||||
@@ -26,7 +26,7 @@ set timeout=60
|
||||
@ -32,8 +32,8 @@ index 2f6fedb..a779fe7 100644
|
||||
submenu 'Troubleshooting -->' {
|
||||
menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
||||
linux @KERNELPATH@ @ROOT@ nomodeset
|
||||
diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||||
index c6a3d68..72ff14b 100644
|
||||
|
||||
|
||||
--- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||||
+++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||||
@@ -26,7 +26,7 @@ set timeout=60
|
||||
@ -42,11 +42,11 @@ index c6a3d68..72ff14b 100644
|
||||
### BEGIN /etc/grub.d/10_linux ###
|
||||
-menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
||||
+menuentry 'Start @PRODUCT@ @VERSION@ with GUI mode' --class red --class gnu-linux --class gnu --class os {
|
||||
linux @KERNELPATH@ @ROOT@ rd.live.image quiet
|
||||
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet
|
||||
initrd @INITRDPATH@
|
||||
}
|
||||
@@ -34,6 +34,10 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-
|
||||
linux @KERNELPATH@ @ROOT@ rd.live.image rd.live.check quiet
|
||||
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
||||
initrd @INITRDPATH@
|
||||
}
|
||||
+menuentry 'Start @PRODUCT@ @VERSION@ with text mode' --class red --class gnu-linux --class gnu --class os {
|
||||
@ -55,7 +55,7 @@ index c6a3d68..72ff14b 100644
|
||||
+}
|
||||
submenu 'Troubleshooting -->' {
|
||||
menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
||||
linux @KERNELPATH@ @ROOT@ rd.live.image nomodeset quiet
|
||||
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From aae1b6a8399062f6aacdad5df474474ef2185f40 Mon Sep 17 00:00:00 2001
|
||||
From 01f9f4badd249214d21e77e12bccc811ea8e2352 Mon Sep 17 00:00:00 2001
|
||||
From: sunguoshuai <sunguoshuai@huawei.com>
|
||||
Date: Fri, 11 Jan 2019 03:17:16 -0500
|
||||
Subject: [PATCH] disable isolabel character change
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH] disable isolabel character change
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/share/templates.d/99-generic/live/x86.tmpl b/share/templates.d/99-generic/live/x86.tmpl
|
||||
index 9290dbb..ba0ffdc 100644
|
||||
index a76c062..1ed1165 100644
|
||||
--- a/share/templates.d/99-generic/live/x86.tmpl
|
||||
+++ b/share/templates.d/99-generic/live/x86.tmpl
|
||||
@@ -9,10 +9,10 @@ LIVEDIR="LiveOS"
|
||||
@ -24,10 +24,10 @@ index 9290dbb..ba0ffdc 100644
|
||||
-isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
||||
+#isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
||||
|
||||
import os
|
||||
from os.path import basename
|
||||
%>
|
||||
diff --git a/share/templates.d/99-generic/x86.tmpl b/share/templates.d/99-generic/x86.tmpl
|
||||
index 1b0a940..aff0255 100644
|
||||
index 3d9d0a4..bdbba04 100644
|
||||
--- a/share/templates.d/99-generic/x86.tmpl
|
||||
+++ b/share/templates.d/99-generic/x86.tmpl
|
||||
@@ -9,10 +9,10 @@ KERNELDIR=PXEBOOTDIR
|
||||
@ -42,8 +42,8 @@ index 1b0a940..aff0255 100644
|
||||
-isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
||||
+#isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
|
||||
|
||||
import os
|
||||
from os.path import basename
|
||||
%>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 5dcb100b5edb443e7d39a1635a5a9aca191d2b18 Mon Sep 17 00:00:00 2001
|
||||
From: fengtao <fengtao40@huawei.com>
|
||||
Date: Mon, 24 Feb 2020 11:07:16 +0800
|
||||
Subject: [PATCH] Fix live-iso creation on aarch64
|
||||
|
||||
---
|
||||
share/templates.d/99-generic/live/aarch64.tmpl | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/share/templates.d/99-generic/live/aarch64.tmpl b/share/templates.d/99-generic/live/aarch64.tmpl
|
||||
index 532b242..969c0df 100644
|
||||
--- a/share/templates.d/99-generic/live/aarch64.tmpl
|
||||
+++ b/share/templates.d/99-generic/live/aarch64.tmpl
|
||||
@@ -68,13 +68,6 @@ mkdir ${KERNELDIR}
|
||||
%endif
|
||||
%endfor
|
||||
|
||||
-# Inherit iso-graft/ if it exists from external templates
|
||||
-<%
|
||||
- import os
|
||||
- if os.path.exists(workdir + "/iso-graft"):
|
||||
- filegraft += " " + workdir + "/iso-graft"
|
||||
-%>
|
||||
-
|
||||
# Add the license files
|
||||
%for f in glob("/usr/share/licenses/*-release/*"):
|
||||
install ${f} ${f|basename}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
28
lorax.spec
28
lorax.spec
@ -2,8 +2,8 @@
|
||||
%define disable_cross 0
|
||||
|
||||
Name: lorax
|
||||
Version: 29.16
|
||||
Release: 11
|
||||
Version: 33.6
|
||||
Release: 1
|
||||
Summary: A set of tools used to create bootable images
|
||||
License: GPLv2+
|
||||
URL: https://github.com/weldr/lorax
|
||||
@ -21,7 +21,6 @@ Patch9008: lorax-enable-GUI-installation.patch
|
||||
Patch9009: lorax-enable-anaconda-KdumpSpoke.patch
|
||||
Patch9010: lorax-delete-udisk2-iscsi.patch
|
||||
|
||||
Patch6000: backport-Fix-live-iso-creation-on-aarch64.patch
|
||||
|
||||
BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic
|
||||
BuildRequires: python3-nose python3-pytest-mock python3-pocketlint python3-gevent
|
||||
@ -29,13 +28,14 @@ BuildRequires: python3-mock python3-urllib3 python3-dnf python3-librepo
|
||||
BuildRequires: python3-libselinux python3-mako python3-kickstart
|
||||
|
||||
Requires: lorax-templates GConf2 cpio device-mapper dosfstools e2fsprogs
|
||||
Requires: findutils gawk genisoimage glib2 glibc glibc-common gzip isomd5sum
|
||||
Requires: module-init-tools parted squashfs-tools util-linux xz pigz
|
||||
Requires: dracut kpartx libselinux-python3 python3-mako python3-kickstart
|
||||
Requires: findutils gawk xorriso glib2 glibc glibc-common gzip isomd5sum
|
||||
Requires: module-init-tools parted squashfs-tools util-linux xz-lzma-compat xz pigz
|
||||
Requires: pbzip2 dracut kpartx libselinux-python3 python3-mako python3-kickstart
|
||||
Requires: python3-dnf python3-librepo
|
||||
|
||||
%ifarch %{ix86} x86_64
|
||||
Requires: syslinux >= 6.02-4
|
||||
Requires: syslinux >= 6.03-1
|
||||
Requires: syslinux-nonlinux >= 6.03-1
|
||||
%endif
|
||||
|
||||
%ifarch %{arm}
|
||||
@ -84,7 +84,7 @@ BuildRequires: python3-flask python3-gobject libgit2-glib python3-pytoml python3
|
||||
Requires: lorax = %{version}-%{release}
|
||||
Requires(pre): /usr/bin/getent /usr/sbin/groupadd /usr/sbin/useradd
|
||||
|
||||
Requires: python3-pytoml python3-semantic_version libgit2 libgit2-glib
|
||||
Requires: python3-toml python3-semantic_version libgit2 libgit2-glib
|
||||
Requires: python3-flask python3-gevent anaconda-tui qemu-img tar
|
||||
|
||||
%{?systemd_requires}
|
||||
@ -121,7 +121,6 @@ build images, etc. from the command line.
|
||||
%patch9008 -p1
|
||||
%patch9009 -p1
|
||||
%patch9010 -p1
|
||||
%patch6000 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -164,10 +163,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%{_sbindir}/lorax
|
||||
%{_sbindir}/mkefiboot
|
||||
%{_sbindir}/livemedia-creator
|
||||
%{_sbindir}/mkksiso
|
||||
%dir %{_sysconfdir}/lorax
|
||||
%dir %{_datadir}/lorax
|
||||
%dir %{_datadir}/lorax/templates.d
|
||||
%{_datadir}/lorax/templates.d/*
|
||||
%{_tmpfilesdir}/lorax.conf
|
||||
|
||||
%if 0%{?disable_cross}
|
||||
%files lmc-virt
|
||||
@ -179,10 +180,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/lorax/composer.conf
|
||||
%{python3_sitelib}/pylorax/api/*
|
||||
%{python3_sitelib}/lifted/*
|
||||
%{_sbindir}/lorax-composer
|
||||
%{_unitdir}/lorax-composer.*
|
||||
%dir %{_datadir}/lorax/composer
|
||||
%{_datadir}/lorax/composer/*
|
||||
%{_datadir}/lorax/lifted/*
|
||||
%{_tmpfilesdir}/lorax-composer.conf
|
||||
%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/
|
||||
%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/blueprints/
|
||||
@ -190,8 +193,8 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
|
||||
%files -n composer-cli
|
||||
%defattr(-,root,root,-)
|
||||
%{_sysconfdir}/bash_completion.d/composer
|
||||
%{_bindir}/composer
|
||||
%{_sysconfdir}/bash_completion.d/composer-cli
|
||||
%{_bindir}/composer-cli
|
||||
%{python3_sitelib}/composer/*
|
||||
|
||||
%files help
|
||||
@ -200,6 +203,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%{_mandir}/man1/*.1*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 28 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.6-1
|
||||
- upgrade to 33.6
|
||||
|
||||
* Mon May 25 2020 songnannan <songnannan2@huawei.com> - 29.16-11
|
||||
- rebuild for the update packages
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user