Merge branch 'master' of https://github.com/subgraph/citadel
This commit is contained in:
commit
abd1c393a4
3
Makefile
3
Makefile
@ -24,6 +24,9 @@ citadel-image: ## Build citadel-image with bitbake
|
||||
citadel-kernel: ## Build citadel-kernel with bitbake
|
||||
$(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
|
||||
mkdir -p build/debootstrap
|
||||
$(DOCKER_RUN_PRIV) sudo scripts/build-user-rootfs-stage-one | tee build/debootstrap/build-user-rootfs.log
|
||||
|
@ -43,8 +43,8 @@ cleanup_chroot() {
|
||||
|
||||
generate_tarball() {
|
||||
printf "\n\n----- Generating rootfs tarball -----\n\n"
|
||||
tar -C ${DBS_ROOT} -c --xattrs --xattrs-include=* -f ${DBS_BASE}/user-rootfs.tar .
|
||||
#xz --force --threads=0 ${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
|
||||
ls -al ${DBS_BASE}/user-rootfs.tar
|
||||
printf "\n\n"
|
||||
}
|
||||
|
@ -13,6 +13,6 @@ if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TEMPLATECONF=../meta-citadel-distro/conf
|
||||
TEMPLATECONF=../meta-citadel/conf
|
||||
. poky/oe-init-build-env
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user