packages/lorax
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!12 update to 31.9

Browse Source 
Merge pull request !12 from compile_success/master
This commit is contained in:
openeuler-ci-bot 2020-08-03 16:55:51 +08:00 committed by Gitee
commit 1975edad5d
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-add-text-mode-selection-menu-in-grub-configuration.patch
View File

@ -42,11 +42,11 @@ index c6a3d68..72ff14b 100644
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -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 { +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@ initrd @INITRDPATH@
} }
@@ -34,6 +34,10 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu- @@ -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@ initrd @INITRDPATH@
} }
+menuentry 'Start @PRODUCT@ @VERSION@ with text mode' --class red --class gnu-linux --class gnu --class os { +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 -->' { submenu 'Troubleshooting -->' {
menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { 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.8.3.1

6
0001-disable-isolabel-character-change.patch
View File

@ -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)
+#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 from os.path import basename
%>
diff --git a/share/templates.d/99-generic/x86.tmpl b/share/templates.d/99-generic/x86.tmpl diff --git a/share/templates.d/99-generic/x86.tmpl b/share/templates.d/99-generic/x86.tmpl
index 1b0a940..aff0255 100644 index 1b0a940..aff0255 100644
--- a/share/templates.d/99-generic/x86.tmpl --- 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)
+#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 from os.path import basename
%>
-- --
1.8.3.1 1.8.3.1

BIN
lorax-29.16-1.tar.gz → lorax-31.9-1.tar.gz
View File

Binary file not shown.

23
lorax.spec
View File

@ -2,8 +2,8 @@
%define disable_cross 0 %define disable_cross 0
Name: lorax Name: lorax
Version: 29.16 Version: 31.9
Release: 10 Release: 1
Summary: A set of tools used to create bootable images Summary: A set of tools used to create bootable images
License: GPLv2+ License: GPLv2+
URL: https://github.com/weldr/lorax 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 BuildRequires: python3-libselinux python3-mako python3-kickstart
Requires: lorax-templates GConf2 cpio device-mapper dosfstools e2fsprogs Requires: lorax-templates GConf2 cpio device-mapper dosfstools e2fsprogs
Requires: findutils gawk genisoimage glib2 glibc glibc-common gzip isomd5sum Requires: findutils gawk xorriso glib2 glibc glibc-common gzip isomd5sum
Requires: module-init-tools parted squashfs-tools util-linux xz pigz Requires: module-init-tools parted squashfs-tools util-linux xz-lzma-compat xz pigz
Requires: dracut kpartx libselinux-python3 python3-mako python3-kickstart Requires: pbzip2 dracut kpartx libselinux-python3 python3-mako python3-kickstart
Requires: python3-dnf python3-librepo Requires: python3-dnf python3-librepo
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
Requires: syslinux >= 6.02-4 Requires: syslinux >= 6.03-1
Requires: syslinux-nonlinux >= 6.03-1
%endif %endif
%ifarch %{arm} %ifarch %{arm}
@ -84,7 +85,7 @@ BuildRequires: python3-flask python3-gobject libgit2-glib python3-pytoml python3
Requires: lorax = %{version}-%{release} Requires: lorax = %{version}-%{release}
Requires(pre): /usr/bin/getent /usr/sbin/groupadd /usr/sbin/useradd 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 Requires: python3-flask python3-gevent anaconda-tui qemu-img tar
%{?systemd_requires} %{?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
%dir %{_datadir}/lorax/templates.d %dir %{_datadir}/lorax/templates.d
%{_datadir}/lorax/templates.d/* %{_datadir}/lorax/templates.d/*
%{_tmpfilesdir}/lorax.conf
%if 0%{?disable_cross} %if 0%{?disable_cross}
%files lmc-virt %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 %files -n composer-cli
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sysconfdir}/bash_completion.d/composer %{_sysconfdir}/bash_completion.d/composer-cli
%{_bindir}/composer %{_bindir}/composer-cli
%{python3_sitelib}/composer/* %{python3_sitelib}/composer/*
%files help %files help
@ -200,6 +202,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%changelog %changelog
* Thu Jun 18 2020 zhujunhao <zhujunhao8@huawei.com> - 31.9-1
- update to 31.9
* Mon Mar 16 2020 songnannan <songnannan2@huawei.com> - 29.16-10 * Mon Mar 16 2020 songnannan <songnannan2@huawei.com> - 29.16-10
- disbale the virt pacakge - disbale the virt pacakge

4
lorax.yaml
View File

@ -1,4 +0,0 @@
version_control: github
src_repo: weldr/lorax
tag_prefix: ^v
seperator: .