Re: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
23 Dec
2013
23 Dec
'13
10:59 a.m.
Hi David,
Welcome back. I hope all is well. :)
The question that
brought up was "do I need to modify any of the scripts I use that
update my
local git repo to handle the 'origin/v3.5.13-sru' designation, or
will the
change be handled by the .gitmodule data?
Look at the scripts directory:
http://git.trinitydesktop.org/cgit/scripts/tree/
Basically all I do is run switch_all_submodules_to_head_and_clean
inside a wrapper script.
What is the state of HAL requirements? I presume it
is still
fully required in
3.5.13, but what about 14? I will be building 3.5.13, so I'll
start by checking
on the state of HAL in the Arch user repository.
Trinity R14 has its own HAL-independent hardware support. 3.5.13.2
still uses HAL available. You can use HAL in R14 if you want, you
need to apply the appropriate configuration options. Look at the
following tdelibs config if you want to build outside the defaults:
-DWITH_HAL
-DWITH_TDEHWLIB_DAEMONS
-DWITH_UPOWER
-DWITH_UDISKS
-DWITH_UDISKS2
I believe most if not all of the development team is using R14.
Many of us have 3.5.13.2 test partitions or VMs. 3.5.13.2 can be
built from the official tarballs, whereas R14 is built from the GIT
tree.
Although there have been many changes in the past months, the
structure of the git tree remains the same. The scripts noted above
have not been modified in a long while either.
Darrell
23 Dec
23 Dec
2:38 p.m.
New subject: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
On 12/23/2013 12:59 PM, Darrell Anderson wrote:
Ran that version, it did complete, but I did get a number of strange conflict
errors at the beginning:
Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity-debian.diff
Adding main/thirdparty/libreoffice/3.3.2/patches/NOTES
CONFLICT (directory/file): There is a directory with name main/thirdparty in
HEAD. Adding main/thirdparty as
main/thirdparty~023b18ec6b52629d8666d284152f6147af098595
Auto-merging main/tdewebdev
CONFLICT (submodule): Merge conflict in main/tdewebdev
Auto-merging main/tdevelop
CONFLICT (submodule): Merge conflict in main/tdevelop
Auto-merging main/tdeutils
CONFLICT (submodule): Merge conflict in main/tdeutils
Auto-merging main/tdetoys
...
The concern I have is I get those CONFLICT messages even if I re-run the script
after it completes. Is there some magic git command I should run to resolve the
CONFLICT?
Thanks Darrell, that is exactly what I needed to know. I'll try pulling the
3.5.13 updates in a little bit (after a few more Christmas light strands go
up... - I hate burned out bulbs....) I'll let you know how the 3.5.13 update goes.
--
David C. Rankin, J.D.,P.E.
Hi David,
Welcome back. I hope all is well. :)
Good to be back. 2013 will go down as the year everything broke (4-servers,
telephone system, copiers, etc.., the economy in East Texas hit rock bottom, but
bankruptcy was avoided by the skin of my teeth ;-)
I just hope my efforts building tde on Arch are not in vain with all the changes
in Arch over the past year. The good news, the major filesystem reorganizations
and move to systemd are complete and the dust has settled. From what I can tell,
tde should run, but the changes to my build scripts will not be negligible... I
will also have to find a good systemd unit-file cheat-sheet for tde, though
there should not be too much to it.
The question that
brought up was "do I need to modify any of the scripts I use that
update my
local git repo to handle the 'origin/v3.5.13-sru' designation, or
will the
change be handled by the .gitmodule data?
Look at the scripts directory:
http://git.trinitydesktop.org/cgit/scripts/tree/
Basically all I do is run switch_all_submodules_to_head_and_clean
inside a wrapper script. What is the state of HAL requirements? I presume
it is still
fully required in
3.5.13, but what about 14? I will be building 3.5.13, so I'll
start by checking
on the state of HAL in the Arch user repository.
I believe most if not all of the development team is using R14.
Many of us have 3.5.13.2 test partitions or VMs. 3.5.13.2 can be
built from the official tarballs, whereas R14 is built from the GIT
tree.
Although there have been many changes in the past months, the
structure of the git tree remains the same. The scripts noted above
have not been modified in a long while either.
Darrell
24 Dec
24 Dec
12:40 p.m.
New subject: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
On 12/23/2013 04:38 PM, David C. Rankin wrote:
Thanks Darrell, that is exactly what I needed to know.
I'll try pulling the
3.5.13 updates in a little bit (after a few more Christmas light strands go
up... - I hate burned out bulbs....) I'll let you know how the 3.5.13 update goes.
Strange,
Pulling 3.5.13 and switching to the new apps that now have a v3.5.13-sru
branch went smooth as butter? Go figure:
http://www.3111skyline.com/dl/dt/trinity/err/git/git-3513-modules.txt
It makes it sort-of easy now that all modules have a v3.5.13-sru branch...
--
David C. Rankin, J.D.,P.E.
4021
days inactive
4022
days old
2 comments
2 participants
participants (2)
-
Darrell Anderson -
David C. Rankin