brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/subgraph/citadel

Browse Source
This commit is contained in:
Bruce Leidl 2018-03-04 13:31:25 -05:00
commit abd1c393a4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -24,6 +24,9 @@ citadel-image: ## Build citadel-image with bitbake
citadel-kernel: ## Build citadel-kernel with bitbake citadel-kernel: ## Build citadel-kernel with bitbake
$(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-kernel" $(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-kernel"
bootloader: ## Build systemd-boot
$(DOCKER_RUN) bash -c "source setup-build-env && bitbake systemd-boot"
user-rootfs: ## Build user-rootfs tarball with debootstrap and configuration scripts user-rootfs: ## Build user-rootfs tarball with debootstrap and configuration scripts
mkdir -p build/debootstrap mkdir -p build/debootstrap
$(DOCKER_RUN_PRIV) sudo scripts/build-user-rootfs-stage-one | tee build/debootstrap/build-user-rootfs.log $(DOCKER_RUN_PRIV) sudo scripts/build-user-rootfs-stage-one | tee build/debootstrap/build-user-rootfs.log

4
scripts/build-user-rootfs-stage-one
View File

@ -43,8 +43,8 @@ cleanup_chroot() {
generate_tarball() { generate_tarball() {
printf "\n\n----- Generating rootfs tarball -----\n\n" printf "\n\n----- Generating rootfs tarball -----\n\n"
tar -C ${DBS_ROOT} -c --xattrs --xattrs-include=* -f ${DBS_BASE}/user-rootfs.tar . tar -C ${DBS_ROOT} --numeric-owner -c --xattrs --xattrs-include=* -f ${DBS_BASE}/user-rootfs.tar .
#xz --force --threads=0 ${DBS_BASE}/user-rootfs.tar xz --force --threads=0 ${DBS_BASE}/user-rootfs.tar
ls -al ${DBS_BASE}/user-rootfs.tar ls -al ${DBS_BASE}/user-rootfs.tar
printf "\n\n" printf "\n\n"
} }

2
setup-build-env
View File

@ -13,6 +13,6 @@ if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
exit 1 exit 1
fi fi
TEMPLATECONF=../meta-citadel-distro/conf TEMPLATECONF=../meta-citadel/conf
. poky/oe-init-build-env . poky/oe-init-build-env