Skip to content
Snippets Groups Projects
Commit 0685d048 authored by Daniel Schulte's avatar Daniel Schulte
Browse files

Added workaround for checking out lipstick git into non empty filesystem image

parent be41824d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 2 deletions
Makefile
+ 5
− 2
View file @ 0685d048
...@@ -205,9 +205,12 @@ $(call gentargets,$(INITRD_TARGET)) : $(call archdir,%)$(STATE_DIR)/initrd_remas ...@@ -205,9 +205,12 @@ $(call gentargets,$(INITRD_TARGET)) : $(call archdir,%)$(STATE_DIR)/initrd_remas
cd "$(call archdir,$*)$(INITRD)" && find | cpio -H newc -o | lzma -z > "$(call archdir,$*)$(INITRD_TARGET)" cd "$(call archdir,$*)$(INITRD)" && find | cpio -H newc -o | lzma -z > "$(call archdir,$*)$(INITRD_TARGET)"
image_git $(IMAGE_DIR)/.git: |$(WORKSPACE) image_git $(IMAGE_DIR)/.git: |$(WORKSPACE)
mkdir -p "$(IMAGE_DIR)"
test ! -e "$(IMAGE_DIR)/.git" test ! -e "$(IMAGE_DIR)/.git"
cd "$(IMAGE_DIR)" && git clone "$(IMAGE_GIT_URL)" . mkdir -p "$(IMAGE_DIR)"
cd "$(IMAGE_DIR)" && git init
cd "$(IMAGE_DIR)" && git remote add origin "$(IMAGE_GIT_URL)"
cd "$(IMAGE_DIR)" && git fetch
cd "$(IMAGE_DIR)" && git checkout -t "origin/$(IMAGE_GIT_BRANCH)"
image_git_pull: |$(IMAGE_DIR)/.git image_git_pull: |$(IMAGE_DIR)/.git
cd "$(IMAGE_DIR)" && $(SHELL) ./scripts/update_stick.sh "$(IMAGE_GIT_BRANCH)" cd "$(IMAGE_DIR)" && $(SHELL) ./scripts/update_stick.sh "$(IMAGE_GIT_BRANCH)"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment