...
 
Commits (6)
image: devkitpro/devkita64:latest
stages:
- build-prepare
- package
- create image
rebase-upstream-auto:
image: $CI_SERVER_HOST:4567/libretro/infrastructure/libretro-build-amd64-ubuntu:latest
stage: build-prepare
only: [chat]
before_script:
- url_host=`git remote get-url origin | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
script:
- git config user.name $GIT_ACCESS_USER
- git config user.email $GIT_ACCESS_EMAIL
- git fetch origin
- git reset --hard
- git clean -fd
- git checkout $CI_COMMIT_REF_NAME
- git reset --hard origin/$CI_COMMIT_REF_NAME
- git remote set-url origin "https://$GIT_ACCESS_USER:$GIT_ACCESS_TOKEN@${url_host}"
- git remote add upstream "https://github.com/switchbrew/libnx.git"
- git fetch upstream
- git rebase upstream/master
- git push origin ${CI_BUILD_REF_NAME} --force || true
package:
stage: package
before_script:
- dkp-pacman -Syy
- dkp-pacman -S --noconfirm devkitARM
- export DEVKITPRO=/opt/devkitpro
- export DEVKITARM=/opt/devkitpro/devkitARM
script:
- make -j10
- make install
- rm -rf libnx/
- mv /opt/devkitpro/libnx libnx/
artifacts:
name: libnx
paths:
- libnx/
docker image:
stage: create image
script:
- "curl -X POST -F token=$TOKEN_DOCKER_IMAGE -F ref=master https://git.m4xw.net/api/v4/projects/103/trigger/pipeline"
when: on_success
only:
- master
nightly image:
stage: create image
script:
- "curl -X POST -F token=$TOKEN_DOCKER_IMAGE -F ref=develop https://git.m4xw.net/api/v4/projects/103/trigger/pipeline"
when: on_success
only:
- develop
- cicd/updates
......@@ -33,7 +33,7 @@ INCLUDES := include external/bsd/include
#---------------------------------------------------------------------------------
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIC -ftls-model=local-exec
CFLAGS := -g -Wall -Werror \
CFLAGS := -g -Wall \
-ffunction-sections \
-fdata-sections \
$(ARCH) \
......@@ -122,7 +122,7 @@ debug:
lib/libnx.a : lib release $(SOURCES) $(INCLUDES)
@$(MAKE) BUILD=release OUTPUT=$(CURDIR)/$@ \
BUILD_CFLAGS="-DNDEBUG=1 -O2" \
BUILD_CFLAGS="-DNDEBUG=1 -O3 -ffast-math" \
DEPSDIR=$(CURDIR)/release \
--no-print-directory -C release \
-f $(CURDIR)/Makefile
......
......@@ -205,6 +205,7 @@ typedef enum {
FsSaveDataFlags_KeepAfterResettingSystemSaveData = BIT(0),
FsSaveDataFlags_KeepAfterRefurbishment = BIT(1),
FsSaveDataFlags_KeepAfterResettingSystemSaveDataWithoutUserSaveData = BIT(2),
FsSaveDataFlags_NeedsSecureDelete = BIT(3),
} FsSaveDataFlags;
typedef enum {
......
......@@ -6,6 +6,7 @@
*/
#pragma once
#include "../types.h"
#include "../crypto/sha256.h"
/// StorageId
typedef enum {
......@@ -90,6 +91,12 @@ typedef struct {
u8 id_offset; ///< Offset of this content. Unused by most applications.
} NcmContentInfo;
/// PackagedContentInfo
typedef struct {
u8 hash[SHA256_HASH_SIZE];
NcmContentInfo info;
} NcmPackagedContentInfo;
/// Used by system updates. They share the exact same struct as NcmContentMetaKey
typedef NcmContentMetaKey NcmContentMetaInfo;
......