Last modified by christoph_lechleitner@iteg_at on 2025-08-11 12.45:34

From version 6.1
edited by christoph_lechleitner@iteg_at
on 2019-03-23 11.23:47
Change comment: PBAO arch|unix|7
To version 7.1
edited by christoph_lechleitner@iteg_at
on 2021-10-01 09.49:14
Change comment: Reflecting switch from svn to git, first adaptions rg. debian 11 bullseye

Summary

Details

Page properties
Content
... ... @@ -2,20 +2,22 @@
2 2  
3 3  About every 2 years Debian introduces a new release.
4 4  
5 -At the time I'm writing this Debian [[Buster>>url:https://wiki.debian.org/DebianBuster||shape="rect"]] is on it's way from Full Freeze to GA.
5 +The following notes shall provide a step-by-step-plan for adapting the [[PBA Package Builder + Archiver>>doc:PBA.WebHome]] to a new Debian release and shall make it more efficient for the next Debian.
6 6  
7 -The following notes shall provide a step-by-step-plan for adapting the [[PBA Package Builder + Archiver>>doc:PBA.WebHome]] to a new Debian release and shall make it more efficient for the next Debian or maybe Ubuntu release.
7 +The first version of this page was created when Debian [[Buster>>url:https://wiki.debian.org/DebianBuster||shape="rect"]] was on it's way from Full Freeze to GA.
8 8  
9 +Currently we are in the progress of adapting to Debian [[Bullseye>>url:https://wiki.debian.org/DebianBullseye||shape="rect"]], and we have switched from {{code language="none"}}svn{{/code}} to {{code language="none"}}git{{/code}}. Currently this is __WORK IN PROGRESS__ rg. Bullseye.
10 +
9 9  = {{id name="AdaptingPBAtonewDebianRelease-AdaptingpbatonewDebianRelease"/}}Adapting pba to new Debian Release =
10 10  
11 11  === {{id name="AdaptingPBAtonewDebianRelease-Preprations"/}}Preprations ===
12 12  
13 13  {{code}}
14 -OLDREL=stretch
15 -NEWREL=buster
16 +OLDDN=stretch
17 +NEWDN=buster
16 16  
17 -cd ~/sources/pba/trunk/pba
18 -svn up ..
19 +# we prefix name of feature branches issue number or epic numbers
20 +ISSUENR="e1"BRANCHNAME="${ISSUENR}_adapt_to_debian_11_${NEWDN}" ; echo "Branch name: ${BRANCHNAME}"
19 19  {{/code}}
20 20  
21 21  === {{id name="AdaptingPBAtonewDebianRelease-Adaptionsforphase1,towardsGA"/}}Adaptions for phase 1, towards GA ===
... ... @@ -23,17 +23,25 @@
23 23  In phase 1 we make the new distribution known in the sense of adding a template for distributions.d/.
24 24  
25 25  {{code}}
26 -cat src/etc/pba/distributions.d/${OLDREL} |sed -e "s/${OLDREL}/${NEWREL}/g" >src/etc/pba/distributions.d/${NEWREL}
27 -svn add src/etc/pba/distributions.d/${NEWREL}
28 +cd ~/sources/pba/git/pba
28 28  
30 +git checkout main ; git pull ; git checkout main
31 +
32 +git branch ${BRANCHNAME} && git checkout ${BRANCHNAME} && git status
33 +
34 +git push --set-upstream origin ${BRANCHNAME}
35 +
36 +cat src/etc/pba/distributions.d/${OLDDN} |sed -e "s/${OLDDN}/${NEWDN}/g" >src/etc/pba/distributions.d/${NEWDN}
37 +git add src/etc/pba/distributions.d/${NEWDN}
38 +
29 29  # evtl. drop ancient ones
30 -svn rm src/etc/pba/distributions.d/
40 +git rm src/etc/pba/distributions.d/foobar
31 31  
32 -${EDITOR:-vi} debian/changelog debian/rules debian/pba-common.install src/etc/pba/distributions.d/${NEWREL} debian/control
42 +${EDITOR:-vi} debian/changelog debian/rules debian/pba-common.install src/etc/pba/distributions.d/${NEWDN} debian/control
33 33  # src/etc/pba/builder.conf.template src/lib/build-functions.pl
34 34  
35 35  # commit
36 -svn commit -m "Adding support for new Debian distro ${NEWREL}"
46 +git commit -m "Adding support for new Debian distro ${NEWDN}"
37 37  
38 38  # release it
39 39  pba-release
... ... @@ -43,15 +43,26 @@
43 43  
44 44  {{code language="none"}}
45 45  cd ~/sources/pba/trunk/pba-helloworld
46 -svn up ..
47 47  
57 +git checkout main ; git pull ; git checkout main
58 +
59 +git branch ${BRANCHNAME} && git checkout ${BRANCHNAME} && git status
60 +
61 +git push --set-upstream origin ${BRANCHNAME}
62 +
63 +pba-raiseversion
64 +# decide next version
65 +pba-raisversion -b 1.2.3 "Adding new Debian target distro ${NEWDN}"
66 +
67 +git add debian*/control debian*/changelog
68 +
48 48  PBAO="."
49 49  # or
50 50  PBAO="arch|unix"
51 -# or in phase 2
72 +# or in phase 2 or when combining
52 52  PBAO="arch|unix|7"
53 53  
54 -pba-builddeps -i -o ${PBAO}
75 +#pba-builddeps -i -o ${PBAO}
55 55  
56 56  #pba-instdeps -i -o ${PBAO}
57 57  
... ... @@ -62,35 +62,39 @@
62 62  PBADD=$(ls -1d debian* |grep -v mingw |head -1)
63 63  ${EDITOR:-vi} ${PBADD}/changelog ${PBADD}/control
64 64  
65 -pba-syncchangelogs
86 +pba-localbuild -u -o ${PBAO}
66 66  
67 -pba-release -u -b pba-spool/ -o ${PBAO} && \
68 -sudo pba-builder -B pba-spool -b pba-results -o ${PBAO} 2>&1 |tee pba-builder.log
88 +# evtl.
89 +#pba-localrpmbuild -u -o ${PBAO}
69 69  
70 70  # wait for success
71 71  
72 -sudo rm -rf pba-spool/ pba-results pba-builder.log
93 +git commit -m "Adding support for new Debian distro ${NEWDN}"
94 +git push
73 73  
74 -svn commit -m "Adding support for new Debian distro ${NEWREL}"
75 -
96 +# optional, eventually after merge in main
76 76  pba-release -o ${PBAO}
77 77  
78 78  
79 79  {{/code}}
80 80  
81 -Repeat for pba-hellolib-portable (with -o unix).
102 +LATER (after adapting Fancylibs below) repeat for {{code language="none"}}pba-helloworld-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
82 82  
83 -Repeat for pba-hellobigworld-portable (with -o unix).
104 +Repeat for {{code language="none"}}pba-hellolib-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
84 84  
85 -... with (% style="letter-spacing: 0.0px;" %){{code language="none"}}-o unix{{/code}}(%%) or later (% style="letter-spacing: 0.0px;" %){{code language="none"}}-o "unix|7"{{/code}}(%%).
106 +Repeat for {{code language="none"}}pba-hellobigworld-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
86 86  
108 +... with (% style="letter-spacing: 0.0px;" %){{code language="none"}}-o unix{{/code}}(%%) or later (% style="letter-spacing: 0.0px;" %){{code language="none"}}-o "unix|9"{{/code}}(%%).
109 +
87 87  === {{id name="AdaptingPBAtonewDebianRelease-AdaptFANCYLIBS"/}}Adapt [[doc:FANCYLIBS.WebHome]] ===
88 88  
89 -See [[doc:FANCYLIBS.Adapting FancyLibs & MinGW-Pkg from Debian 9 Stretch to 10 Buster, Mingw-7 to Mingw-8.WebHome]],
112 +**~-~-- current point of adaption to Debian Bullseye ~-~--**
90 90  
114 +See [[Adapting FancyLibs & MinGW-Pkg from Debian 9 Stretch to 10 Buster, Mingw-7 to Mingw-8>>doc:FANCYLIBS.Adapting FancyLibs & MinGW-Pkg from Debian 9 Stretch to 10 Buster, Mingw-7 to Mingw-8.WebHome]].
115 +
91 91  === {{id name="AdaptingPBAtonewDebianRelease-Adaptpba-helloworld-portable"/}}Adapt pba-helloworld-portable ===
92 92  
93 -See above, use -o unix.
118 +See above, use {{code language="none"}}-o unix{{/code}}.
94 94  
95 95  === {{id name="AdaptingPBAtonewDebianRelease-CreatePBA-Buildertarballs"/}}Create PBA-Builder tarballs ===
96 96  
... ... @@ -100,9 +100,9 @@
100 100  
101 101  See [[doc:MINGW64.mingw 6 rebuild order.WebHome]].
102 102  
103 -=== {{id name="AdaptingPBAtonewDebianRelease-Adaptpba-hello*-portable"/}}Adapt pba-hello*-portable ===
128 +=== {{id name="AdaptingPBAtonewDebianRelease-MinGW-Adaptpba-hello*-portable"/}}MinGW-Adapt pba-hello*-portable ===
104 104  
105 -See above, with -o "unix|7" instead of "-o unix".
130 +See above, with -o "unix|9" instead of "-o unix".
106 106  
107 107  === {{id name="AdaptingPBAtonewDebianRelease-Adaptionsforphase2,oncenewreleaseissettled"/}}Adaptions for phase 2, once new release is settled ===
108 108  
... ... @@ -112,7 +112,7 @@
112 112  ${EDITOR:-vi} debian/changelog src/etc/pba/builder.conf.template src/lib/build-functions.pl
113 113  
114 114  # commit
115 -svn commit -m "Making new Debian distro ${NEWREL} default for DefaultDistribution in pba-builder.conf"
140 +git commit -m "Making new Debian distro ${NEWDN} default for DefaultDistribution in pba-builder.conf"
116 116  
117 117  # release it
118 118  pba-release
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -910950419
1 +968785981
URL
... ... @@ -1,1 +1,1 @@
1 -https://clazzes.atlassian.net/wiki/spaces/PBA/pages/910950419/Adapting PBA to new Debian Release
1 +https://clazzes.atlassian.net/wiki/spaces/PBA/pages/968785981/Adapting PBA to new Debian Release