Skip to content

Commit

Permalink
Merge pull request #110 from spacemeowx2/feature-overlay
Browse files Browse the repository at this point in the history
add overlay
  • Loading branch information
spacemeowx2 authored Nov 3, 2021
2 parents 9acdc83 + 1725ff7 commit 2f03069
Show file tree
Hide file tree
Showing 12 changed files with 826 additions and 43 deletions.
39 changes: 22 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
with:
submodules: true
- uses: spacemeowx2/devkitpro-action@latest
with:
cmd: make -j8
- uses: actions/checkout@v1
with:
submodules: true
- uses: spacemeowx2/devkitpro-action@latest
with:
cmd: make -j8

- name: Upload built files
uses: actions/upload-artifact@v1
with:
name: sdcard
path: out/sd
- name: Upload built files
uses: actions/upload-artifact@v1
with:
name: sdcard
path: out/sd

- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: ldn_mitm/ldn_mitm.elf

- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: ldn_mitm/ldn_mitm.elf

- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: overlay/overlay.elf
50 changes: 28 additions & 22 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,39 @@ name: Nightly

on:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
with:
submodules: true
- name: update Atmosphere-libs
run: |
pushd Atmosphere-libs
git reset --hard origin/master
popd
- uses: spacemeowx2/devkitpro-action@latest
with:
cmd: make -j8
- uses: actions/checkout@v1
with:
submodules: true
- name: update Atmosphere-libs
run: |
pushd Atmosphere-libs
git reset --hard origin/master
popd
- uses: spacemeowx2/devkitpro-action@latest
with:
cmd: make -j8

- name: Upload built files
uses: actions/upload-artifact@v1
with:
name: sdcard
path: out/sd
- name: Upload built files
uses: actions/upload-artifact@v1
with:
name: sdcard
path: out/sd

- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: ldn_mitm/ldn_mitm.elf
- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: ldn_mitm/ldn_mitm.elf

- name: Upload elf file
uses: actions/upload-artifact@v1
with:
name: ldn_mitm.elf
path: overlay/overlay.elf
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ dkms.conf
make.bat
*.log
.vscode
*.zip

# overlay
*.ovl
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "Atmosphere-libs"]
path = Atmosphere-libs
url = https://github.com/Atmosphere-NX/Atmosphere-libs.git
[submodule "libtesla"]
path = libtesla
url = https://github.com/WerWolv/libtesla.git
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
KIPS := ldn_mitm
NROS := ldnmitm_config

SUBFOLDERS := Atmosphere-libs/libstratosphere $(KIPS) $(NROS)
SUBFOLDERS := Atmosphere-libs/libstratosphere $(KIPS) $(NROS) overlay

TOPTARGETS := all clean

OUTDIR := out
SD_ROOT := $(OUTDIR)/sd
NRO_DIR := $(SD_ROOT)/switch/ldnmitm_config
TITLE_DIR := $(SD_ROOT)/atmosphere/contents/4200000000000010
OVERLAY_DIR := $(SD_ROOT)/switch/.overlays

$(TOPTARGETS): PACK

Expand All @@ -19,10 +20,11 @@ $(KIPS): Atmosphere-libs/libstratosphere

#---------------------------------------------------------------------------------
PACK: $(SUBFOLDERS)
@[ -d $(NRO_DIR) ] || mkdir -p $(NRO_DIR)
@[ -d $(TITLE_DIR)/flags ] || mkdir -p $(TITLE_DIR)/flags
@ cp ldnmitm_config/ldnmitm_config.nro $(NRO_DIR)/ldnmitm_config.nro
@ mkdir -p $(TITLE_DIR)/flags
@ mkdir -p $(OVERLAY_DIR)
@ cp ldn_mitm/ldn_mitm.nsp $(TITLE_DIR)/exefs.nsp
@ cp overlay/overlay.ovl $(OVERLAY_DIR)/ldnmitm_config.ovl
@ cp ldn_mitm/res/toolbox.json $(TITLE_DIR)/toolbox.json
@ touch $(TITLE_DIR)/flags/boot2.flag
#---------------------------------------------------------------------------------

Expand Down
5 changes: 5 additions & 0 deletions ldn_mitm/res/toolbox.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "ldn_mitm",
"tid": "4200000000000010",
"requires_reboot": true
}
1 change: 1 addition & 0 deletions libtesla
Submodule libtesla added at 640629
Loading

0 comments on commit 2f03069

Please sign in to comment.