QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lorax: use repo file for sources

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-12-17 23:48:09 +01:00
parent 748d05dddd
commit 8b9a31d25a
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -49,9 +49,7 @@ BASE_DIR := $(INSTALLER_DIR)/work/$(ISO_VERSION)/x86_64
LORAX_OPTS += --version "$(ISO_VERSION)" --release "Qubes $(ISO_VERSION)" --volid $(ISO_VOLID)
LORAX_OPTS += --workdir $(INSTALLER_DIR)/work/work/x86_64 --logfile $(INSTALLER_DIR)/work/logs/lorax-x86_64.log
LORAX_OPTS += --source http://download.fedoraproject.org/pub/fedora/linux/releases/$(DIST_VER)/Everything/x86_64/os/
LORAX_OPTS += --source http://download.fedoraproject.org/pub/fedora/linux/updates/$(DIST_VER)/Everything/x86_64/
LORAX_OPTS += --source $(BASE_DIR)/os/
LORAX_OPTS += --repo $(INSTALLER_DIR)/conf/dnf-lorax.repo
MKISOFS := /usr/bin/xorriso -as mkisofs
# common mkisofs flags
@ -89,6 +87,7 @@ iso-installer-gather:
pushd $(BASE_DIR)/os/ && $(CREATEREPO) -q .
iso-installer-lorax:
sed -e "s/%FCREL%/$(DIST_VER)/g" $(INSTALLER_DIR)/conf/dnf-lorax.repo.in > $(INSTALLER_DIR)/conf/dnf-lorax.repo
$(LORAX) $(LORAX_OPTS) $(BASE_DIR)/os
iso-installer-mkisofs:
@ -97,7 +96,6 @@ iso-installer-mkisofs:
/usr/bin/isohybrid -u $(BASE_DIR)/iso/$(ISO_VOLID).iso
/usr/bin/implantisomd5 $(BASE_DIR)/iso/$(ISO_VOLID).iso
iso-installer: iso-prepare iso-installer-gather iso-installer-lorax iso-installer-mkisofs
# Move result files to known-named directories
mkdir -p build/ISO/qubes-x86_64/iso

27
conf/dnf-lorax.repo.in Normal file
View File

@ -0,0 +1,27 @@
[fedora]
name=Fedora %FCREL% - x86_64
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/%FCREL%/Everything/x86_64/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-%FCREL%&arch=x86_64
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-x86_64
[updates]
name=Fedora %FCREL% - x86_64 - Updates
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/%FCREL%/Everything/x86_64/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f%FCREL%&arch=x86_64
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-x86_64
[installer]
name=installer
baseurl=file:///tmp/qubes-installer/yum/installer
enabled=1
[qubes-dom0]
name=qubes-dom0
baseurl=file:///tmp/qubes-installer/yum/qubes-dom0
enabled=1