diff --git a/0001-add-text-mode-selection-menu-in-grub-configuration.patch b/0001-add-text-mode-selection-menu-in-grub-configuration.patch index de4c06dc80ebc176e7330700e367a72f0044f0e3..129af175585c630d808334068caa320f7161fad5 100644 --- a/0001-add-text-mode-selection-menu-in-grub-configuration.patch +++ b/0001-add-text-mode-selection-menu-in-grub-configuration.patch @@ -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 diff --git a/0001-disable-isolabel-character-change.patch b/0001-disable-isolabel-character-change.patch index 130d87d1005800f20cd1e6bf405c617f95869c8c..f3c692606e04369420494c29021f57ac4b7e9873 100644 --- a/0001-disable-isolabel-character-change.patch +++ b/0001-disable-isolabel-character-change.patch @@ -24,8 +24,8 @@ 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 --- a/share/templates.d/99-generic/x86.tmpl @@ -41,9 +41,9 @@ 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 diff --git a/lorax-29.16-1.tar.gz b/lorax-31.9-1.tar.gz similarity index 56% rename from lorax-29.16-1.tar.gz rename to lorax-31.9-1.tar.gz index 06207ce66435d1bd24106ed35520fb0181ddac4d..8bc95b542eea6057476636a0a7ab78489b1b5074 100644 Binary files a/lorax-29.16-1.tar.gz and b/lorax-31.9-1.tar.gz differ diff --git a/lorax.spec b/lorax.spec index 5b46b7500c0a853fbe06d919f7eba5a0dc08b4e8..59184dc4aaf318b427021bc3b98bff73eaf752d7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -2,8 +2,8 @@ %define disable_cross 0 Name: lorax -Version: 29.16 -Release: 10 +Version: 31.9 +Release: 1 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -29,13 +29,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 +85,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} @@ -168,6 +169,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %dir %{_datadir}/lorax %dir %{_datadir}/lorax/templates.d %{_datadir}/lorax/templates.d/* +%{_tmpfilesdir}/lorax.conf %if 0%{?disable_cross} %files lmc-virt @@ -190,8 +192,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 +202,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* Thu Jun 18 2020 zhujunhao - 31.9-1 +- update to 31.9 + * Mon Mar 16 2020 songnannan - 29.16-10 - disbale the virt pacakge diff --git a/lorax.yaml b/lorax.yaml deleted file mode 100644 index 2985af015e6b5500bc581cd2e2e53db21bca0f4e..0000000000000000000000000000000000000000 --- a/lorax.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: weldr/lorax -tag_prefix: ^v -seperator: .