summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-21 15:54:40 -0300
committerGenerated from internal repo <nobody@neo900.org>2016-09-21 15:54:40 -0300
commit0e63422f3ad627f7bfa8d5878ccde99b5d97826d (patch)
tree267b63d8993084741c1313fe671be0eb4491cb91
parentf77c9a9324fea3652372ceae15e7642488f3e479 (diff)
downloadee-0e63422f3ad627f7bfa8d5878ccde99b5d97826d.tar.gz
ee-0e63422f3ad627f7bfa8d5878ccde99b5d97826d.tar.bz2
ee-0e63422f3ad627f7bfa8d5878ccde99b5d97826d.zip
Makefile, hw/Makefile, README (sync): synchronize kicad-libs with "ee"
... after changing the checked-out commit.
-rw-r--r--Makefile5
-rw-r--r--README20
-rw-r--r--hw/Makefile6
3 files changed, 29 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 84be847..cfc5595 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
-.PHONY: pull
+.PHONY: pull sync
pull:
$(MAKE) -C hw pull
+
+sync:
+ $(MAKE) -C hw sync
diff --git a/README b/README
index 4d10467..d471e61 100644
--- a/README
+++ b/README
@@ -59,6 +59,26 @@ A shortcut for all the above is available as (if in ee/ or ee/hw/):
make pull
+Going back in history
+---------------------
+
+In general, kicad-libs tries to be backward-compatible, such that new
+changes - except for critical bug fixes - will not affect designs based
+on an older version of the repository.
+
+However, if the exact state of kicad-libs at some point in the history
+of "ee" is needed, it can be obtained as follows:
+
+cd ee
+git checkout <desired_commit_of_neo900-ee>
+make sync
+
+To return to the present,
+
+git checkout master
+make sync
+
+
Incorporating new changes from kicad-libs
-----------------------------------------
diff --git a/hw/Makefile b/hw/Makefile
index 1304942..a7c2c25 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -1,13 +1,17 @@
NAME = neo900
SCHTOC = ../../misc/schtoc/schtoc.pl
-.PHONY: pull sch sort brd pdf upload upload-pdf upload-tar clean
+.PHONY: pull sync sch sort brd pdf upload upload-pdf upload-tar clean
pull:
git pull
git submodule update --init
$(MAKE) -C kicad-libs/components
+sync:
+ git submodule update
+ $(MAKE) -C kicad-libs/components
+
sch:
[ -e kicad-libs ] || ln -s ../../../qi/kicad-libs .
eeschema $(NAME).sch