Skip to content

Commit 082fa84

Browse files
EndeavourOS Mercury-T2
2 parents 04159e5 + 41739cb commit 082fa84

14 files changed

Lines changed: 59 additions & 31 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33

44
---
5+
6+
# Post Endeavour Development start (2024)
7+
* adding Memtest for EFI (systemd-boot)
8+
* kpmcore is downgraded on neo release as of latest causes issues with automatic partition options.
9+
10+
# Endeavour Release + Neo (2024)
11+
* Basically a rebuild
12+
* kpmcore is downgraded on neo release as of latest causes issues with automatic partition options.
13+
514
# Gemini initial Release (2024)
615
* removal of ARM install traces from the ISO
716
* switching livesession to fit for plasma 6 update

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Forked EndeavourOS-ISO for Macs with T2 security chip, nothing more, nothing les
44

55
# EndeavourOS-ISO
66

7-
[![Maintenance](https://img.shields.io/maintenance/yes/2024.svg)]()
7+
[![Maintenance](https://img.shields.io/maintenance/yes/2025.svg)]()
88

99
**main** branch is development latest (unstable)
1010

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.local/share/applications/eos-log-tool.desktop

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,18 @@ Type=Application
33
Encoding=UTF-8
44
Name=EndeavourOS log tool
55
Comment=Log tool to send selected system logs to the internet
6+
Comment[de]=Log-Tool zum Teilen ausgewählter Systemprotokolle über das Internet
7+
Comment[es]=Herramienta de registro para enviar registros del sistema seleccionados a Internet
68
Comment[fi]=Jaa valitsemasi järjestelmälokit internetiin muiden nähtäväksi
9+
Comment[fr]=Outil de journalisation pour envoyer les journaux système sélectionnés à Internet
10+
Comment[it]=Strumento di registro per inviare i registri di sistema selezionati a Internet
11+
Comment[jp]=選択したシステムログをインターネットに送信するログツール
12+
Comment[ko]=선택한 시스템 로그를 인터넷으로 전송하는 로그 도구
13+
Comment[pt_BR]=O instrumento de log para enviar sistema selecionado registra em log à Internet
14+
Comment[ru]=Инструмент для отправки выбранных системных журналов в Интернет
15+
Comment[sv]=Loggverktyg för att skicka valda systemloggar till Internet
16+
Comment[tr]=İnternete seçilen sistem günlüklerini göndermek için günlük aracı
17+
Comment[zh_CN]=用于将选定的系统日志发送到互联网的日志工具
718
Exec=/usr/bin/eos-log-tool
819
Icon=utilities-log-viewer.svg
920
Hidden=false
8.68 MB
Loading

airootfs/root/liveuser.png

-3.04 KB
Loading

airootfs/root/livewall.png

5.41 MB
Loading
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
title Memtest86+
2+
sort-key D
3+
efi /boot/memtest86+/memtest.efi

mkarchiso

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,14 @@ _mkairootfs_squashfs() {
245245

246246
# Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
247247
_mkairootfs_erofs() {
248-
local fsuuid mkfs_erofs_options=()
248+
local mkfs_erofs_options=()
249249
[[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
250250

251251
install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
252252
local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
253253
rm -f -- "${image_path}"
254254
[[ ! "${quiet}" == "y" ]] || mkfs_erofs_options+=('--quiet')
255-
# Generate reproducible file system UUID from SOURCE_DATE_EPOCH
256-
fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
257-
mkfs_erofs_options+=('-U' "${fsuuid}" "${airootfs_image_tool_options[@]}")
255+
mkfs_erofs_options+=('-U' '00000000-0000-0000-0000-000000000000' "${airootfs_image_tool_options[@]}")
258256
_msg_info "Creating EROFS image, this may take some time..."
259257
mkfs.erofs "${mkfs_erofs_options[@]}" -- "${image_path}" "${pacstrap_dir}"
260258
_msg_info "Done!"
@@ -1411,7 +1409,7 @@ _validate_requirements_buildmode_bootstrap() {
14111409
# Check if the compressor is installed
14121410
if (( ${#bootstrap_tarball_compression[@]} )); then
14131411
case "${bootstrap_tarball_compression[0]}" in
1414-
'bzip'|'gzip'|'lrzip'|'lzip'|'lzop'|'zstd'|'zstdmt')
1412+
'bzip'|'gzip'|'lrzip'|'lzip'|'lzop'|'xz'|'zstd'|'zstdmt')
14151413
if ! command -v "${bootstrap_tarball_compression[0]}" &>/dev/null; then
14161414
(( validation_error=validation_error+1 ))
14171415
_msg_error "Validating build mode '${_buildmode}': '${bootstrap_tarball_compression[0]}' is not available on this host. Install '${bootstrap_tarball_compression[0]/zstdmt/zstd}'!" 0
@@ -1709,34 +1707,20 @@ _add_xorrisofs_options_uefi-x64.grub.eltorito() {
17091707

17101708
# Build bootstrap image
17111709
_build_bootstrap_image() {
1712-
local tarball_ext
1713-
17141710
# Set default tarball compression to uncompressed
17151711
if (( ! "${#bootstrap_tarball_compression[@]}" )); then
17161712
bootstrap_tarball_compression=('cat')
17171713
fi
17181714

1719-
# Set tarball extension
1720-
case "${bootstrap_tarball_compression[0]}" in
1721-
'cat') tarball_ext='' ;;
1722-
'bzip') tarball_ext='.b2z' ;;
1723-
'gzip') tarball_ext='.gz' ;;
1724-
'lrzip') tarball_ext='.lrz' ;;
1725-
'lzip') tarball_ext='.lz' ;;
1726-
'lzop') tarball_ext='.lzo' ;;
1727-
'zstd'|'zstdmt') tarball_ext='.zst' ;;
1728-
*) _msg_error 'Unsupported compression!' 1 ;;
1729-
esac
1730-
17311715
[[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
17321716

17331717
cd -- "${bootstrap_parent}"
17341718

17351719
_msg_info "Creating bootstrap image..."
1736-
rm -f -- "${out_dir:?}/${image_name:?}${tarball_ext}"
1737-
bsdtar -cf - "root.${arch}" "pkglist.${arch}.txt" | "${bootstrap_tarball_compression[@]}" >"${out_dir}/${image_name}${tarball_ext}"
1720+
rm -f -- "${out_dir:?}/${image_name:?}"
1721+
bsdtar -cf - "root.${arch}" "pkglist.${arch}.txt" | "${bootstrap_tarball_compression[@]}" >"${out_dir}/${image_name}"
17381722
_msg_info "Done!"
1739-
du -h -- "${out_dir}/${image_name}${tarball_ext}"
1723+
du -h -- "${out_dir}/${image_name}"
17401724
cd -- "${OLDPWD}"
17411725
}
17421726

@@ -2059,6 +2043,17 @@ _build_buildmode_bootstrap() {
20592043
[[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
20602044
install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
20612045

2046+
# Set tarball extension
2047+
case "${bootstrap_tarball_compression[0]}" in
2048+
'bzip') image_name="${image_name}.b2z" ;;
2049+
'gzip') image_name="${image_name}.gz" ;;
2050+
'lrzip') image_name="${image_name}.lrz" ;;
2051+
'lzip') image_name="${image_name}.lz" ;;
2052+
'lzop') image_name="${image_name}.lzo" ;;
2053+
'xz') image_name="${image_name}.xz" ;;
2054+
'zstd'|'zstdmt') image_name="${image_name}.zst" ;;
2055+
esac
2056+
20622057
[[ "${quiet}" == "y" ]] || _show_config
20632058
_run_once _make_pacman_conf
20642059
_run_once _make_packages

mkarchiso-changes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
re-merge upstream changes from 2025.02.08
2+
```
3+
Version archiso 82-1
4+
5+
```
16
re-merge upstream changes from 2024.09.07
27
```
38
Version archiso 79-1

packages.x86_64

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ mtools
5050
nfs-utils
5151
nilfs-utils
5252
ntfs-3g
53-
reiserfsprogs
5453
xfsprogs
5554

5655
## Boot
@@ -181,6 +180,7 @@ python-capng
181180
## Live iso specific
182181
arch-install-scripts
183182
memtest86+
183+
memtest86+-efi
184184
mkinitcpio-archiso
185185
mkinitcpio-nfs-utils
186186
pv
@@ -204,7 +204,7 @@ bluedevil
204204
breeze-gtk
205205
dolphin
206206
dolphin-plugins
207-
eos-plasma-sddm-config
207+
eos-breeze-sddm
208208
ffmpegthumbs
209209
fwupd
210210
gwenview
@@ -245,7 +245,6 @@ sddm-kcm
245245
spectacle
246246
xdg-desktop-portal-kde
247247
xsettingsd
248-
xwaylandvideobridge
249248

250249
## Browser
251250
firefox
@@ -267,7 +266,7 @@ ttf-opensans
267266
# ENDEAVOUROS REPO
268267

269268
## General
270-
endeavouros-theming
269+
endeavouros-branding
271270
eos-apps-info
272271
eos-hooks
273272
eos-log-tool

0 commit comments

Comments
 (0)