forked from mirrored-repos/manjaro-tools
Merge branch 'devel'
This commit is contained in:
commit
cbbe486c1b
5 changed files with 4 additions and 24 deletions
10
Makefile
10
Makefile
|
@ -1,4 +1,4 @@
|
||||||
Version=0.9.11
|
Version=0.9.12
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
SYSCONFDIR = /etc
|
SYSCONFDIR = /etc
|
||||||
|
@ -93,10 +93,6 @@ SCRIPTS = \
|
||||||
scripts/livecd \
|
scripts/livecd \
|
||||||
scripts/kbd-model-map
|
scripts/kbd-model-map
|
||||||
|
|
||||||
EFISHELL = \
|
|
||||||
efi_shell/shellx64_v1.efi \
|
|
||||||
efi_shell/shellx64_v2.efi
|
|
||||||
|
|
||||||
MAN_XML = \
|
MAN_XML = \
|
||||||
buildset.xml \
|
buildset.xml \
|
||||||
buildpkg.xml \
|
buildpkg.xml \
|
||||||
|
@ -190,9 +186,6 @@ install_iso:
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts
|
||||||
install -m0644 ${SCRIPTS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts
|
install -m0644 ${SCRIPTS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/efi_shell
|
|
||||||
install -m0644 ${EFISHELL} $(DESTDIR)$(PREFIX)/share/manjaro-tools/efi_shell
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
|
||||||
gzip -c man/buildiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
|
gzip -c man/buildiso.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
|
||||||
|
|
||||||
|
@ -230,7 +223,6 @@ uninstall_iso:
|
||||||
for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/hooks/$$f; done
|
for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/hooks/$$f; done
|
||||||
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/install/$$f; done
|
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/install/$$f; done
|
||||||
for f in ${SCRIPTS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts/$$f; done
|
for f in ${SCRIPTS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts/$$f; done
|
||||||
for f in ${EFISHELL}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/efi_shell/$$f; done
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
|
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildiso.1.gz
|
||||||
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/manjaro-tools.conf.5.gz
|
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/manjaro-tools.conf.5.gz
|
||||||
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
|
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -9,26 +9,14 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
download_efi_shellv2(){
|
|
||||||
curl -k -o $1/shellx64_v2.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi
|
|
||||||
}
|
|
||||||
|
|
||||||
download_efi_shellv1(){
|
|
||||||
curl -k -o $1/shellx64_v1.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
|
|
||||||
}
|
|
||||||
|
|
||||||
copy_efi_shells(){
|
copy_efi_shells(){
|
||||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v1.efi ]];then
|
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v1.efi ]];then
|
||||||
msg2 "Copying shellx64_v1.efi ..."
|
msg2 "Copying shellx64_v1.efi ..."
|
||||||
cp ${PKGDATADIR}/efi_shell/shellx64_v1.efi $1/
|
cp ${PKGDATADIR}/efi_shell/shellx64_v1.efi $1/
|
||||||
else
|
|
||||||
download_efi_shellv1 "$1"
|
|
||||||
fi
|
fi
|
||||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v2.efi ]];then
|
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v2.efi ]];then
|
||||||
msg2 "Copying shellx64_v2.efi ..."
|
msg2 "Copying shellx64_v2.efi ..."
|
||||||
cp ${PKGDATADIR}/efi_shell/shellx64_v2.efi $1/
|
cp ${PKGDATADIR}/efi_shell/shellx64_v2.efi $1/
|
||||||
else
|
|
||||||
download_efi_shellv2 "$1"
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +53,7 @@ copy_efi_loaders(){
|
||||||
msg2 "Copying efi loaders ..."
|
msg2 "Copying efi loaders ..."
|
||||||
cp $1/usr/lib/prebootloader/PreLoader.efi $2/bootx64.efi
|
cp $1/usr/lib/prebootloader/PreLoader.efi $2/bootx64.efi
|
||||||
cp $1/usr/lib/prebootloader/HashTool.efi $2/
|
cp $1/usr/lib/prebootloader/HashTool.efi $2/
|
||||||
cp $1/usr/lib/gummiboot/gummibootx64.efi $2/loader.efi
|
cp ${PKGDATADIR}/efi_shell/systemd-bootx64.efi $2/loader.efi
|
||||||
}
|
}
|
||||||
|
|
||||||
copy_boot_images(){
|
copy_boot_images(){
|
||||||
|
|
|
@ -377,7 +377,7 @@ init_buildiso(){
|
||||||
|
|
||||||
[[ -z ${iso_checksum} ]] && iso_checksum='md5'
|
[[ -z ${iso_checksum} ]] && iso_checksum='md5'
|
||||||
|
|
||||||
[[ -z ${use_overlayfs} ]] && use_overlayfs='false'
|
[[ -z ${use_overlayfs} ]] && use_overlayfs='true'
|
||||||
used_kernel=$(uname -r | cut -d . -f1)
|
used_kernel=$(uname -r | cut -d . -f1)
|
||||||
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
|
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
|
||||||
}
|
}
|
||||||
|
@ -427,7 +427,7 @@ load_profile_config(){
|
||||||
|
|
||||||
[[ -z ${default_desktop_file} ]] && default_desktop_file="none"
|
[[ -z ${default_desktop_file} ]] && default_desktop_file="none"
|
||||||
|
|
||||||
[[ -z ${kernel} ]] && kernel="linux318"
|
[[ -z ${kernel} ]] && kernel="linux41"
|
||||||
used_kernel=$(echo ${kernel} | cut -c 6)
|
used_kernel=$(echo ${kernel} | cut -c 6)
|
||||||
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
|
[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue