mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

jinx: use as a submodule instead

Browse Source
This commit is contained in:
Matheus
2026-05-02 14:29:40 -03:00
parent a3a21f6e52
commit 94f978430e
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-1
View File
@@ -4,7 +4,6 @@ host-builds
host-pkgs host-pkgs
iso iso
img img
jinx
pkgs pkgs
sources sources
astral.iso astral.iso
.gitmodules
+3
View File
@@ -1,3 +1,6 @@
[submodule "kernel-src/io/acpi/uacpi"] [submodule "kernel-src/io/acpi/uacpi"]
path = kernel-src/io/acpi/uacpi path = kernel-src/io/acpi/uacpi
url = https://github.com/UltraOS/uACPI url = https://github.com/UltraOS/uACPI
[submodule "jinx"]
path = jinx
url = https://codeberg.org/Mintsuki/jinx.git
Makefile
+11 -13
View File
@@ -40,14 +40,13 @@ all: $(JINX_DIR)/.astral_ok
@echo "|--------------------------------------------------------------|" @echo "|--------------------------------------------------------------|"
@echo @echo
jinx: jinx/jinx:
curl https://codeberg.org/Mintsuki/jinx/raw/commit/1c40ceb62e09befc5172d1caf53e3e440a19f624/jinx > jinx git submodule update --init --recursive jinx
chmod +x jinx
$(JINX_DIR)/.astral_ok: jinx $(JINX_DIR)/.astral_ok: jinx/jinx
mkdir -p $(JINX_DIR) mkdir -p $(JINX_DIR)
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx init .. ARCH=$(JINX_ARCH) && \ ../jinx/jinx init .. ARCH=$(JINX_ARCH) && \
touch .astral_ok touch .astral_ok
iso: $(ISO) iso: $(ISO)
@@ -73,27 +72,27 @@ kernel:
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
rm -f builds/astral.packaged && \ rm -f builds/astral.packaged && \
rm -f builds/astral.built && \ rm -f builds/astral.built && \
../jinx build astral ../jinx/jinx build astral
distro-minimal: distro-minimal:
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx update $(MINIMALPACKAGES) ../jinx/jinx update $(MINIMALPACKAGES)
distro-full: distro-full:
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx update '*' ../jinx/jinx update '*'
# ------ initrd targets ------ # ------ initrd targets ------
$(INITRD)-full: distro-full $(INITRD)-full: distro-full
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx install sysroot \* && \ ../jinx/jinx install sysroot \* && \
mkdir -p initrds && \ mkdir -p initrds && \
../geninitrd.sh sysroot $(INITRD)-full ../geninitrd.sh sysroot $(INITRD)-full
$(INITRD)-minimal: distro-minimal $(INITRD)-minimal: distro-minimal
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx install minimalsysroot $(MINIMALPACKAGES) && \ ../jinx/jinx install minimalsysroot $(MINIMALPACKAGES) && \
mkdir -p initrds && \ mkdir -p initrds && \
../geninitrd.sh minimalsysroot $(INITRD)-minimal ../geninitrd.sh minimalsysroot $(INITRD)-minimal
@@ -108,12 +107,12 @@ disk: disk-$(DISTROTYPE)
disk-full: distro-full disk-full: distro-full
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx install sysroot \* && \ ../jinx/jinx install sysroot \* && \
../gendisk.sh 7g sysroot $(DISKNAME) ../gendisk.sh 7g sysroot $(DISKNAME)
disk-minimal: distro-minimal disk-minimal: distro-minimal
cd $(JINX_DIR) && \ cd $(JINX_DIR) && \
../jinx install minimalsysroot $(MINIMALPACKAGES) && \ ../jinx/jinx install minimalsysroot $(MINIMALPACKAGES) && \
../gendisk.sh 1900m minimalsysroot $(DISKNAME) ../gendisk.sh 1900m minimalsysroot $(DISKNAME)
# ------ clean targets ------ # ------ clean targets ------
@@ -125,7 +124,6 @@ clean-kernel:
find builds/astral/ -name *.asmo -delete find builds/astral/ -name *.asmo -delete
clean: clean:
rm -rf jinx
rm -rf sources rm -rf sources
rm -rf $(JINX_DIR) rm -rf $(JINX_DIR)
# ------ run targets ------ # ------ run targets ------
jinx
Submodule
+1
Submodule jinx added at 1c40ceb62e