|
a/ohbuild.sh |
|
b/ohbuild.sh |
|
... |
|
... |
| 115 |
# only if 'uset4' is set (which it is not by default). Common.mak
|
115 |
# only if 'uset4' is set (which it is not by default). Common.mak
|
| 116 |
# should heed uset4, but it does not. This does not seem to have
|
116 |
# should heed uset4, but it does not. This does not seem to have
|
| 117 |
# consequences, and the errors are suppressed by defining t4 as 'echo'
|
117 |
# consequences, and the errors are suppressed by defining t4 as 'echo'
|
| 118 |
patch -p1 <<EOF
|
118 |
patch -p1 <<EOF
|
| 119 |
diff --git a/Makefile b/Makefile
|
119 |
diff --git a/Makefile b/Makefile
|
| 120 |
index 7c0dae8..ddc4477 100644
|
120 |
index 7c0dae8..6f51a86 100644
|
| 121 |
--- a/Makefile
|
121 |
--- a/Makefile
|
| 122 |
+++ b/Makefile
|
122 |
+++ b/Makefile
|
|
|
123 |
@@ -88,6 +88,9 @@ else
|
|
|
124 |
ifeq ($(gcc_machine),arm-linux-gnueabihf)
|
|
|
125 |
detected_openhome_architecture = armhf
|
|
|
126 |
endif
|
|
|
127 |
ifeq ($(gcc_machine),armv6l-unknown-linux-gnueabihf)
|
|
|
128 |
detected_openhome_architecture = armhf
|
|
|
129 |
endif
|
|
|
130 |
ifneq (,$(findstring i686,$(gcc_machine)))
|
|
|
131 |
detected_openhome_architecture = x86
|
|
|
132 |
endif
|
| 123 |
@@ -412,6 +412,7 @@ ifeq (\$(uset4), yes)
|
133 |
@@ -412,6 +415,7 @@ ifeq ($(uset4), yes)
|
| 124 |
build_targets = \$(build_targets_base) tt
|
134 |
build_targets = $(build_targets_base) tt
|
| 125 |
else
|
135 |
else
|
| 126 |
build_targets = \$(build_targets_base)
|
136 |
build_targets = $(build_targets_base)
|
| 127 |
+t4 = echo
|
137 |
+t4 = echo
|
| 128 |
endif
|
138 |
endif
|
| 129 |
default : all
|
139 |
default : all
|
| 130 |
|
140 |
|
| 131 |
EOF
|
141 |
EOF
|
|
... |
|
... |
| 134 |
# Jul 30 2015
|
144 |
# Jul 30 2015
|
| 135 |
git checkout 92294ce514dbe38fa569fce8b58588f40bf09cdb || exit 1
|
145 |
git checkout 92294ce514dbe38fa569fce8b58588f40bf09cdb || exit 1
|
| 136 |
git checkout Makefile
|
146 |
git checkout Makefile
|
| 137 |
patch -p1 <<EOF
|
147 |
patch -p1 <<EOF
|
| 138 |
diff --git a/Makefile b/Makefile
|
148 |
diff --git a/Makefile b/Makefile
|
| 139 |
index a7b84e3..9c335f8 100644
|
149 |
index a7b84e3..5175a6f 100644
|
| 140 |
--- a/Makefile
|
150 |
--- a/Makefile
|
| 141 |
+++ b/Makefile
|
151 |
+++ b/Makefile
|
|
|
152 |
@@ -79,6 +79,9 @@ else
|
|
|
153 |
ifeq ($(gcc_machine),arm-linux-gnueabihf)
|
|
|
154 |
detected_openhome_architecture = armhf
|
|
|
155 |
endif
|
|
|
156 |
ifeq ($(gcc_machine),armv6l-unknown-linux-gnueabihf)
|
|
|
157 |
detected_openhome_architecture = armhf
|
|
|
158 |
endif
|
|
|
159 |
ifneq (,$(findstring i686,$(gcc_machine)))
|
|
|
160 |
detected_openhome_architecture = x86
|
|
|
161 |
endif
|
| 142 |
@@ -359,6 +359,7 @@ ifeq (\$(uset4), yes)
|
162 |
@@ -359,6 +362,7 @@ ifeq ($(uset4), yes)
|
| 143 |
build_targets = \$(build_targets_base) tt
|
163 |
build_targets = $(build_targets_base) tt
|
| 144 |
else
|
164 |
else
|
| 145 |
build_targets = \$(build_targets_base)
|
165 |
build_targets = $(build_targets_base)
|
| 146 |
+t4 = echo
|
166 |
+t4 = echo
|
| 147 |
endif
|
167 |
endif
|
| 148 |
default : all
|
168 |
default : all
|
| 149 |
|
169 |
|
| 150 |
EOF
|
170 |
EOF
|
| 151 |
|
171 |
|
| 152 |
cd $topdir/ohdevtools
|
172 |
cd $topdir/ohdevtools
|
| 153 |
# Dec 9 2015
|
173 |
# Dec 9 2015
|
| 154 |
git checkout 77f4f971e2c62e84a7eab2a1bcf4aa3dc3590840 || exit 1
|
174 |
git checkout 77f4f971e2c62e84a7eab2a1bcf4aa3dc3590840 || exit 1
|