Skip to content

Commit

Permalink
Merge pull request #97 from fritzprix/fix/0.1.0-config
Browse files Browse the repository at this point in the history
fix pip issue for building on ubuntu host environment
  • Loading branch information
fritzprix authored Apr 15, 2019
2 parents d586e12 + 81de2e1 commit 2a4a93f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ DEFS=$(DEF-y:%=-D%)
DEBUG_OBJS=$(OBJ-y:%=DEBUG/%)
RELEASE_OBJS=$(OBJ-y:%=RELEASE/%)

DEBUG_TARGET=TachyOS_dbg_$(MAJOR).$(MINOR).elf
RELEASE_TARGET=TachyOS_rel_$(MAJOR).$(MINOR).elf
DEBUG_TARGET=TachyOS_dbg_$(MAJOR).$(MINOR).$(PATCH).elf
RELEASE_TARGET=TachyOS_rel_$(MAJOR).$(MINOR).$(PATCH).elf


PHONY=config all debug release clean config_clean
.SILENT : $(SILENT)

SILENT=config $(OBJ-y:%=DEBUG/%) $(OBJ-y:%=RELEASE/%) $(DEBUG_TARGET) $(RELEASE_TARGET)
SILENT=config $(OBJ-y:%=DEBUG/%) $(OBJ-y:%=RELEASE/%) $(DEBUG_TARGET) $(RELEASE_TARGET) reset clean


all : debug
Expand All @@ -84,7 +84,7 @@ $(KCONFIG_TARGET) : $(AUTOGEN_DIR) $(CONFIG_PY)
endif

$(CONFIG_PY):
$(PIP) install jconfigpy -t $(TOOL_DIR)
$(PIP) install jconfigpy --system -t $(TOOL_DIR)



Expand Down Expand Up @@ -140,7 +140,7 @@ RELEASE/%.sko:%.S
clean:
rm -rf $(OBJ-y) $(DEBUG_TARGET) $(RELEASE_TARGET) $(RELEASE_OBJS) $(DEBUG_OBJS)

config_clean:
reset: clean
rm -rf $(KCONFIG_TARGET) $(KCONFIG_AUTOGEN) $(REPO-y) $(LDIR-y)

.PHONY = $(PHONY)
3 changes: 2 additions & 1 deletion version.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
MAJOR=0
MINOR=1
MINOR=1
PATCH=0

0 comments on commit 2a4a93f

Please sign in to comment.