Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upQubes Builder: need to run 'make prepare-merge' twice to get all changes #1420
Comments
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 13, 2015
Member
On Fri, Nov 13, 2015 at 12:21:32PM -0800, Patrick Schleizer wrote:
Both,
qubes-template-whonixandWhonixwhere at git tag12.0.0.3.2-developers-only(same tag name).In my local
qubes-buildAppVM, those were still at12.0.0.3.0-developers-only. So I've runmake prepare-merge. During the first run, onlyqubes-template-whonixwas updated to tag ``12.0.0.3.2-developers-only.Whonix` stayed at `12.0.0.3.0-developers-only`. It was set to `12.0.0.3.2-developers-only` only after running `make prepare-merge` for a second time.
Actually Whonix was set to 12.0.0.3.2-developers-only only after
getting new qubes-template-whonix, because that branch name is set in
this component. And config is loaded at make call time, not reloaded
later.
I would have expected both repositories to be at
12.0.0.3.2-developers-onlywith one run ofmake prepare-merge. Perhaps my expectation is wrong? Perhaps this is a bug that can be fixed?
I'm afraid your expectation is wrong...
You can avoid that by setting BRANCH_Whonix = 12.0.0.3.2-developers-only
in builder.conf directly, but not so convenient solution.
Perhaps it's not that a big deal, because
qubes-template-whonixhaving configuredexport BRANCH_Whonix = 12.0.0.3.2-developers-onlywould have checked outWhonixto12.0.0.3.2-developers-onlyduring the build process? (Not sure, but I think this is what happens.)
No, it will not checkout sources again.
Log attached below.
user@qubes-build:~$ cd qubes-builder/ user@qubes-build:~/qubes-builder$ make prepare-merge
(...)
- '[' -n qubes-src/Whonix ']'
++ basename qubes-src/Whonix- COMPONENT=Whonix
- '[' qubes-src/Whonix == . ']'
- '[' -z Whonix ']'
- '[' -z qubes-src/Whonix ']'
- url_var=GIT_URL_Whonix
- '[' -n '' ']'
- '[' -n https://github.com/Whonix/Whonix.git ']'
- GIT_URL=https://github.com/Whonix/Whonix.git
- '[' -n '' ']'
- branch_var=BRANCH_Whonix
- '[' -n 12.0.0.3.0-developers-only ']'
- BRANCH=12.0.0.3.0-developers-only
- echo '-> Updating sources for Whonix...'
-> Updating sources for Whonix...- echo '--> Fetching from https://github.com/Whonix/Whonix.git 12.0.0.3.0-developers-only...'
--> Fetching from https://github.com/Whonix/Whonix.git 12.0.0.3.0-developers-only...- '[' qubes-src/Whonix == . -o -d qubes-src/Whonix -a '' '!=' 1 ']'
- git -C qubes-src/Whonix fetch -q https://github.com/Whonix/Whonix.git --tags 12.0.0.3.0-developers-only
So, as you can see, it is still set to 12.0.0.3.0-developers-only.
Because that was set in template-whonix/components.conf at make prepare-merge call time.
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
|
On Fri, Nov 13, 2015 at 12:21:32PM -0800, Patrick Schleizer wrote:
Actually
I'm afraid your expectation is wrong... You can avoid that by setting BRANCH_Whonix = 12.0.0.3.2-developers-only
No, it will not checkout sources again.
(...)
So, as you can see, it is still set to Best Regards, |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
adrelanos
Nov 13, 2015
Member
I've run make prepare-merge, make do-merge, make prepare-merge, make do-merge.
The second time it fetched 12.0.0.3.2-developers-only.
+ git -C qubes-src/Whonix fetch -q https://github.com/Whonix/Whonix.git --tags 12.0.0.3.2-developers-only
|
I've run The second time it fetched
|
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
adrelanos
Nov 13, 2015
Member
It's okay for me personally, but I think this is quite confusing generally. I wonder, if
- a) this can be improved in Qubes-Builder?
- b) Or should the Qubes-Whonix build instructions recommend to always run twice, i.e.:
make prepare-merge,make do-merge,make prepare-merge,make do-merge? - c) Or Qubes-Whonix build instructions should recommend to explicitly add for example
BRANCH_Whonix = 12.0.0.3.2-developers-onlytooverride.conf?
|
It's okay for me personally, but I think this is quite confusing generally. I wonder, if
|
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 13, 2015
Member
Or maybe really use some branch (not tag) in BRANCH_Whonix? It would
avoid this problem, since the same setting will work with any future tag.
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
|
Or maybe really use some branch (not tag) in BRANCH_Whonix? It would Best Regards, |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
adrelanos
Nov 13, 2015
Member
Marek Marczykowski-Górecki:
Or maybe really use some branch (not tag) in BRANCH_Whonix? It would
avoid this problem, since the same setting will work with any future tag.
Hm. Then it would always use the latest tag of that branch? Sounds not
too bad.
|
Marek Marczykowski-Górecki:
Hm. Then it would always use the latest tag of that branch? Sounds not |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 13, 2015
Member
On Fri, Nov 13, 2015 at 02:07:34PM -0800, Patrick Schleizer wrote:
Marek Marczykowski-Górecki:
Or maybe really use some branch (not tag) in BRANCH_Whonix? It would
avoid this problem, since the same setting will work with any future tag.Hm. Then it would always use the latest tag of that branch? Sounds not
too bad.
That's the idea of branches ;)
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
|
On Fri, Nov 13, 2015 at 02:07:34PM -0800, Patrick Schleizer wrote:
That's the idea of branches ;) Best Regards, |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
adrelanos
Nov 13, 2015
Member
Or I must somehow merge qubes-template-whonix into Whonix. Do you think qubes-template-whonix could become a subfolder of Whonix? I would like to avoid "mv ./qubes-template-whonix/* ./Whonix/" (that would be a lot new folders and files, kinda looking confusing).
|
Or I must somehow merge |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 13, 2015
Member
I don't think that merging all of that makes sense. But maybe recommend
(in build instruction) configuring components-related settings directly
in qubes-builder - so components.conf and last few lines of
builder.conf from there. Somehow less convenient than just enabling
template-whonix builder plugin, but gives much more control over the
whole process.
But still - having branch name in BRANCH_Whonix setting would also
avoid that problems.
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
|
I don't think that merging all of that makes sense. But maybe recommend But still - having branch name in Best Regards, |
adrelanos
referenced this issue
Nov 13, 2015
Closed
build Qubes-Whonix 12.0.0.3.2 RC templates #1423
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
adrelanos
Nov 15, 2015
Member
But still - having branch name in
BRANCH_Whonixsetting would also avoid that problems.
But only until let's say branch Whonix12 would be replaced by branch Whonix13? Then one need to run 'make prepare-merge' twice to get all changes?
But only until let's say branch |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 15, 2015
Member
On Sun, Nov 15, 2015 at 07:59:15AM -0800, Patrick Schleizer wrote:
But still - having branch name in
BRANCH_Whonixsetting would also avoid that problems.But only until let's say branch
Whonix12would be replaced by branchWhonix13? Then one need to run 'make prepare-merge' twice to get all changes?
Yes...
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
|
On Sun, Nov 15, 2015 at 07:59:15AM -0800, Patrick Schleizer wrote:
Yes... Best Regards, |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
marmarek
Nov 21, 2015
Member
There is a code to workaround similar problem:
https://github.com/marmarek/qubes-template-whonix/blob/master/Makefile#L51-L64
It is enabled only for initial make get-sources (if [ ! -d $$REPO ]). Otherwise would download all components regardless of COMPONENTS setting in builder.conf/command line, at every subsequent make get-sources calls. And I consider this rather a hack than a proper solution...
|
There is a code to workaround similar problem: |
referenced
this issue
in jgriffiths/qubes-builder
Mar 9, 2016
adrelanos commentedNov 13, 2015
•
edited
Edited 1 time
-
adrelanos
edited Nov 30, 2016 (most recent)
Both,
qubes-template-whonixandWhonixwhere at git tag12.0.0.3.2-developers-only(same tag name).In my local
qubes-buildAppVM, those were still at12.0.0.3.0-developers-only. So I've runmake prepare-merge. During the first run, onlyqubes-template-whonixwas updated to tag12.0.0.3.2-developers-only.Whonixstayed at12.0.0.3.0-developers-only. It was set to12.0.0.3.2-developers-onlyonly after runningmake prepare-mergefor a second time.I would have expected both repositories to be at
12.0.0.3.2-developers-onlywith one run ofmake prepare-merge. Perhaps my expectation is wrong? Perhaps this is a bug that can be fixed?Perhaps it's not that a big deal, because
qubes-template-whonixhaving configuredexport BRANCH_Whonix = 12.0.0.3.2-developers-onlywould have checked outWhonixto12.0.0.3.2-developers-onlyduring the build process? (Not sure, but I think this is what happens.)Log attached below.