Skip to content

fix pip issue for building on ubuntu(18.04) host environment #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2019
Merged

fix pip issue for building on ubuntu(18.04) host environment #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4b97d
fix pip issue for building on ubuntu host environment
ZHcubGVlQHNrLmNvbSAK Apr 15, 2019
81de2e1
symantic versioning scheme is adopted
ZHcubGVlQHNrLmNvbSAK Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
MAJOR=0
MINOR=1
MINOR=1
PATCH=0