|
a/ohbuild.sh |
|
b/ohbuild.sh |
|
... |
|
... |
| 71 |
case "$1" in
|
71 |
case "$1" in
|
| 72 |
-t) opt_t=1; tarfile=$2 ; shift 2 ;;
|
72 |
-t) opt_t=1; tarfile=$2 ; shift 2 ;;
|
| 73 |
-b) opt_b=1; shift ;;
|
73 |
-b) opt_b=1; shift ;;
|
| 74 |
-c) opt_c=1; shift ;;
|
74 |
-c) opt_c=1; shift ;;
|
| 75 |
--) shift ; break ;;
|
75 |
--) shift ; break ;;
|
| 76 |
*) echo "Internal error!" ; exit 1 ;;
|
76 |
*) usage ;;
|
| 77 |
esac
|
77 |
esac
|
| 78 |
done
|
78 |
done
|
| 79 |
|
79 |
|
| 80 |
echo opt_t $opt_t
|
80 |
echo opt_t $opt_t
|
| 81 |
echo opt_c $opt_c
|
81 |
echo opt_c $opt_c
|
|
... |
|
... |
| 175 |
|
175 |
|
| 176 |
cd $topdir/ohNetGenerated
|
176 |
cd $topdir/ohNetGenerated
|
| 177 |
# Tue May 9 08:54:47 2017
|
177 |
# Tue May 9 08:54:47 2017
|
| 178 |
git checkout e3edb912410d4c5a4d5323bb1e9c27660a42d78f || exit 1
|
178 |
git checkout e3edb912410d4c5a4d5323bb1e9c27660a42d78f || exit 1
|
| 179 |
git checkout Makefile
|
179 |
git checkout Makefile
|
|
|
180 |
patch -p1 << "EOF"
|
|
|
181 |
diff --git a/Makefile b/Makefile
|
|
|
182 |
index bf7a1ba..49bffaf 100644
|
|
|
183 |
--- a/Makefile
|
|
|
184 |
b/Makefile
|
|
|
185 |
@@ -70,14 +70,17 @@ else
|
|
|
186 |
else ifneq (,$(findstring linux,$(gcc_machine)))
|
|
|
187 |
detected_openhome_system = Linux
|
|
|
188 |
endif
|
|
|
189 |
- ifeq ($(gcc_machine),arm-none-linux-gnueabi)
|
|
|
190 |
- detected_openhome_architecture = armel
|
|
|
191 |
- endif
|
|
|
192 |
- ifeq ($(gcc_machine),arm-linux-gnueabi)
|
|
|
193 |
- detected_openhome_architecture = armel
|
|
|
194 |
- endif
|
|
|
195 |
- ifeq ($(gcc_machine),arm-linux-gnueabihf)
|
|
|
196 |
- detected_openhome_architecture = armhf
|
|
|
197 |
ifneq (,$(findstring arm,$(gcc_machine)))
|
|
|
198 |
ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
|
|
|
199 |
detected_openhome_architecture = armhf
|
|
|
200 |
else ifneq (,$(findstring armv7hl,$(gcc_machine)))
|
|
|
201 |
# cubox: armv7hl-redhat-linux-gnueabi
|
|
|
202 |
detected_openhome_architecture = armhf
|
|
|
203 |
else ifeq (${detected_openhome_system},Qnap)
|
|
|
204 |
detected_openhome_architecture = x19
|
|
|
205 |
else
|
|
|
206 |
detected_openhome_architecture = armel
|
|
|
207 |
endif
|
|
|
208 |
endif
|
|
|
209 |
ifneq (,$(findstring i686,$(gcc_machine)))
|
|
|
210 |
detected_openhome_architecture = x86
|
|
|
211 |
EOF
|
| 180 |
|
212 |
|
| 181 |
cd $topdir/ohTopology
|
213 |
cd $topdir/ohTopology
|
| 182 |
# Wed Mar 22 11:15:28 2017 +0000
|
214 |
# Wed Mar 22 11:15:28 2017 +0000
|
| 183 |
git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
|
215 |
git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
|
| 184 |
|
216 |
|