-
Notifications
You must be signed in to change notification settings - Fork 1
/
SNAGLIST
172 lines (134 loc) · 5.99 KB
/
SNAGLIST
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
ACQ400DRV:
./make.zynq package
cp cal/* opkg/usr/local/cal
cp: target ‘opkg/usr/local/cal’ is not a directory
make: *** [opkgcp] Error
hmm.. rm -Rf opkg; ./make.zynq release ... fixes
make[1]: Leaving directory `/home/peter/PROJECTS/ACQ400_ESW_TOP/ACQ400DRV'
cp ../DRIVERS/emlog/nbcat opkg/usr/local/bin
cp: cannot stat ‘../DRIVERS/emlog/nbcat’: No such file or directory
make: *** [emlog] Error 1
MORE joy!
.. make ACQ400DRV/DRIVERS a subdirectory, then emlog etc become git submodules...
acq400ioc:
../acq400_judgement.cpp:32:22: fatal error: acq-util.h: No such file or directory
#include "acq-util.h"
We have a build! Do we want users to tag?
MODPOST 1 modules
make[3]: Leaving directory `/home/peter/PROJECTS/ACQ400_ESW_TOP/acq400_kernel'
make[2]: Leaving directory `/home/peter/PROJECTS/ACQ400_ESW_TOP/DRIVERS-OOK/emlog'
make[1]: Leaving directory `/home/peter/PROJECTS/ACQ400_ESW_TOP/DRIVERS-OOK'
‘../DRIVERS-OOK/AD5686/ad5686.ko’ -> ‘modules_output/ad5686.ko’
‘../DRIVERS-OOK/AD5686/ad5696-i2c.ko’ -> ‘modules_output/ad5696-i2c.ko’
‘../DRIVERS-OOK/ISL22313/isl22313.ko’ -> ‘modules_output/isl22313.ko’
‘../DRIVERS-OOK/SI5326/si5326.ko’ -> ‘modules_output/si5326.ko’
‘../DRIVERS-OOK/emlog/emlog.ko’ -> ‘modules_output/emlog.ko’
FINISHED: release/packageko-4.14.0-acq400-xilinx-g4cd1b64-230403231729.img size:11592
echo do NOT rm -Rf opkg/*
do NOT rm -Rf opkg/etc opkg/usr
mkdir -p release
tar czf release/10-acq420-230403231729.tgz -C opkg .
created package release/10-acq420-230403231729.tgz
rm -f ../PACKAGES/10-acq420*
git tag -a -m 10-acq420-230403231729.tgz r230403231729
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <[email protected]>) not allowed
make: *** [package] Error 128
peter@naboo ACQ400DRV]$ ls -l release/
total 12060
-rw-rw-r-- 1 peter peter 477957 Apr 3 23:17 10-acq420-230403231729.tgz
-rw-r--r-- 1 peter peter 11870208 Apr 3 23:17 packageko-4.14.0-acq400-xilinx-g4cd1b64-230403231729.img
[pgm@hoy5 ACQ420FMC]$ ls -lt release/ | head
total 7720800
-rw-r--r-- 1 pgm pgm 511549 Apr 3 22:00 10-acq420-230403220027.tgz
-rw-r--r-- 1 pgm pgm 12685312 Apr 3 22:00 packageko-4.14.0-acq400-xilinx-230403220027.img
=> SMALL! probably missing some bits. Or maybe we lost some crud?.
20220406 : Add remaining packages, create a package dir
1008 git submodule update --remote ACQ400DRV
1014 git submodule add https://github.com/D-TACQ/ACQ400_TRANSIENT.git
1016 git submodule update --remote ACQ400_TRANSIENT
1021 mkdir PACKAGES
1022 git add PACKAGES
1023 git submodule add https://github.com/D-TACQ/ACQ400_AI_MONITOR.git
1024 git submodule update --remote ACQ400_AI_MONITOR
OK: policy for shared library
ESW_TOP/include
ESW_TOP/lib/ARCH
ACQ400DRV creates them
acq400ioc links them
end of.
# MAKING A RELEASE
Making a master_version_host
git submodule set-url ACQ400RELEASE [email protected]:D-TACQ/ACQ400RELEASE.git
cd ACQ400RELEASE/
git checkout master
git pull origin master
BUILDING for master FAIL:
- we're in a detached head, so we can't upload .version. So the version never increments.
- research: how to avoid detached head.
20220516:
OK, forget submodules:
git clone [email protected]:D-TACQ/ACQ400RELEASE.git ACQ400RELEASE.M
cd ACQ400RELEASE.M
git clone git://eigg/BITSTREAMS/ACQ400/ ACQ400_FPGA
Updating the master master repo
eg we made changes to ACQ400DRV, ACQ400COMMON, ACQ2x06:
git submodule update --remote ACQ400DRV
remote: Enumerating objects: 8, done.
remote: Counting objects: 100% (8/8), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 3), reused 4 (delta 3), pack-reused 0
Unpacking objects: 100% (5/5), 1.12 KiB | 16.00 KiB/s, done.
[pgm@hoy5 ACQ400_ESW_TOP]$ git submodule update --remote ACQ400COMMON
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 4 (delta 3), reused 4 (delta 3), pack-reused 0
Unpacking objects: 100% (4/4), 543 bytes | 15.00 KiB/s, done.
[pgm@hoy5 ACQ400_ESW_TOP]$ git submodule update --remote ACQ2x06
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 3 (delta 2), reused 3 (delta 2), pack-reused 0
Unpacking objects: 100% (3/3), 397 bytes | 4.00 KiB/s, done.
From https://github.com/D-TACQ/ACQ2x06
1dc7d15..dcc1f3e main -> origin/main
Submodule path 'ACQ2x06': checked out 'dcc1f3e66e15e5bd89f53f4bb9e02e49da94bd59'
On the Master build host:
git pull origin main
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 2 (delta 1), reused 2 (delta 1), pack-reused 0
Unpacking objects: 100% (2/2), 641 bytes | 45.00 KiB/s, done.
From https://github.com/D-TACQ/ACQ400_ESW_TOP
* branch main -> FETCH_HEAD
843808f..f15f339 main -> origin/main
Fetching submodule ACQ2x06
From https://github.com/D-TACQ/ACQ2x06
1dc7d15..dcc1f3e main -> origin/main
Fetching submodule ACQ400COMMON
From https://github.com/D-TACQ/ACQ400COMMON
446e75a..187f658 master -> origin/master
Fetching submodule ACQ400DRV
From https://github.com/D-TACQ/ACQ400DRV
b2a294a..594bfa2 main2 -> origin/main2
Updating 843808f..f15f339
Fast-forward
ACQ2x06 | 2 +-
ACQ400COMMON | 2 +-
ACQ400DRV | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[pgm@staffa3 ACQ400_ESW_TOP]$ git submodule update
Submodule path 'ACQ2x06': checked out 'dcc1f3e66e15e5bd89f53f4bb9e02e49da94bd59'
Submodule path 'ACQ400COMMON': checked out '187f6581b1a64768c820516e3c509b155f1b5331'
Submodule path 'ACQ400DRV': checked out '594bfa2a282536ea8f470fc7a75a4ecc803ec993'
pushd ACQ2x06; ./make.package; popd
cd ACQ400COMMON; ./make.package; popd
cd ACQ400DRV; ./make.zynq package; popd
cd ACQ400RELEASE.M; ./scripts/make.release