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

From 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
To version 4.1
edited by christoph_lechleitner@iteg_at
on 2019-03-23 09.28:14
Change comment: Filled adaption of hello world projects

Summary

Details

Page properties
Content
... ... @@ -2,22 +2,20 @@
2 2  
3 3  About every 2 years Debian introduces a new release.
4 4  
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.
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.
6 6  
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.
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.
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 -
11 11  = {{id name="AdaptingPBAtonewDebianRelease-AdaptingpbatonewDebianRelease"/}}Adapting pba to new Debian Release =
12 12  
13 13  === {{id name="AdaptingPBAtonewDebianRelease-Preprations"/}}Preprations ===
14 14  
15 15  {{code}}
16 -OLDDN=stretch
17 -NEWDN=buster
14 +OLDREL=stretch
15 +NEWREL=buster
18 18  
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}"
17 +cd ~/sources/pba/trunk/pba
18 +svn up ..
21 21  {{/code}}
22 22  
23 23  === {{id name="AdaptingPBAtonewDebianRelease-Adaptionsforphase1,towardsGA"/}}Adaptions for phase 1, towards GA ===
... ... @@ -25,25 +25,17 @@
25 25  In phase 1 we make the new distribution known in the sense of adding a template for distributions.d/.
26 26  
27 27  {{code}}
28 -cd ~/sources/pba/git/pba
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}
29 29  
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 -
39 39  # evtl. drop ancient ones
40 -git rm src/etc/pba/distributions.d/foobar
30 +svn rm src/etc/pba/distributions.d/
41 41  
42 -${EDITOR:-vi} debian/changelog debian/rules debian/pba-common.install src/etc/pba/distributions.d/${NEWDN} debian/control
32 +${EDITOR:-vi} debian/changelog debian/rules debian/pba-common.install src/etc/pba/distributions.d/${NEWREL} debian/control
43 43  # src/etc/pba/builder.conf.template src/lib/build-functions.pl
44 44  
45 45  # commit
46 -git commit -m "Adding support for new Debian distro ${NEWDN}"
36 +svn commit -m "Adding support for new Debian distro ${NEWREL}"
47 47  
48 48  # release it
49 49  pba-release
... ... @@ -53,69 +53,64 @@
53 53  
54 54  {{code language="none"}}
55 55  cd ~/sources/pba/trunk/pba-helloworld
46 +svn up ..
56 56  
57 -git checkout main ; git pull ; git checkout main
58 58  
59 -git branch ${BRANCHNAME} && git checkout ${BRANCHNAME} && git status
49 +PBAO=""
50 +# or
51 +PBAO='-o unix'
60 60  
61 -git push --set-upstream origin ${BRANCHNAME}
62 62  
63 -pba-raiseversion
64 -# decide next version
65 -pba-raisversion -b 1.2.3 "Adding new Debian target distro ${NEWDN}"
54 +pba-builddeps -i ${PBAO}
66 66  
67 -git add debian*/control debian*/changelog
68 68  
69 -PBAO="."
70 -# or
71 -PBAO="arch|unix"
72 -# or in phase 2 or when combining
73 -PBAO="arch|unix|7"
57 +#pba-instdeps -i ${PBAO}
74 74  
75 -#pba-builddeps -i -o ${PBAO}
76 76  
77 -#pba-instdeps -i -o ${PBAO}
60 +pba-build -u -i ${PBAO}
78 78  
79 -pba-build -u -i -o ${PBAO}
80 80  
81 81  # solve eventual problems
82 82  
83 -PBADD=$(ls -1d debian* |grep -v mingw |head -1)
84 -${EDITOR:-vi} ${PBADD}/changelog ${PBADD}/control
85 85  
86 -pba-localbuild -u -o ${PBAO}
66 +${EDITOR:-vi} debian/changelog debian/control
67 +# or
68 +${EDITOR:-vi} debian-unix/changelog debian-unix/control
87 87  
88 -# evtl.
89 -#pba-localrpmbuild -u -o ${PBAO}
90 90  
71 +pba-syncchangelogs
72 +
73 +
74 +pba-release -u -b pba-spool/ ${PBAO}
75 +sudo pba-builder -B pba-spool -b pba-results ${PBAO} 2>&1 |tee pba-builder.log
76 +
77 +
91 91  # wait for success
92 92  
93 -git commit -m "Adding support for new Debian distro ${NEWDN}"
94 -git push
95 95  
96 -# optional, eventually after merge in main
97 -pba-release -o ${PBAO}
81 +sudo rm -rf pba-spool/ pba-results pba-builder.log
98 98  
99 99  
100 -{{/code}}
84 +svn commit -m "Adding support for new Debian distro ${NEWREL}"
101 101  
102 -LATER (after adapting Fancylibs below) repeat for {{code language="none"}}pba-helloworld-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
86 +pba-release ${PBAO}
103 103  
104 -Repeat for {{code language="none"}}pba-hellolib-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
105 105  
106 -Repeat for {{code language="none"}}pba-hellobigworld-portable{{/code}} (with {{code language="none"}}-o unix{{/code}}).
89 +{{/code}}
107 107  
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}}(%%).
91 +Repeat for pba-hellolib-portable (with -o unix).
109 109  
110 -=== {{id name="AdaptingPBAtonewDebianRelease-AdaptFANCYLIBS"/}}Adapt [[doc:FANCYLIBS.WebHome]] ===
93 +Repeat for pba-hellobigworld-portable (with -o unix).
111 111  
112 -**~-~-- current point of adaption to Debian Bullseye ~-~--**
95 +... 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}}(%%).
113 113  
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]].
97 +=== {{id name="AdaptingPBAtonewDebianRelease-AdaptFANCYLIBS"/}}Adapt [[doc:FANCYLIBS.WebHome]] ===
115 115  
99 +TBD.
100 +
116 116  === {{id name="AdaptingPBAtonewDebianRelease-Adaptpba-helloworld-portable"/}}Adapt pba-helloworld-portable ===
117 117  
118 -See above, use {{code language="none"}}-o unix{{/code}}.
103 +See above, use -o unix.
119 119  
120 120  === {{id name="AdaptingPBAtonewDebianRelease-CreatePBA-Buildertarballs"/}}Create PBA-Builder tarballs ===
121 121  
... ... @@ -125,9 +125,9 @@
125 125  
126 126  See [[doc:MINGW64.mingw 6 rebuild order.WebHome]].
127 127  
128 -=== {{id name="AdaptingPBAtonewDebianRelease-MinGW-Adaptpba-hello*-portable"/}}MinGW-Adapt pba-hello*-portable ===
113 +=== {{id name="AdaptingPBAtonewDebianRelease-Adaptpba-hello*-portable"/}}Adapt pba-hello*-portable ===
129 129  
130 -See above, with -o "unix|9" instead of "-o unix".
115 +See above, with -o "unix|7" instead of "-o unix".
131 131  
132 132  === {{id name="AdaptingPBAtonewDebianRelease-Adaptionsforphase2,oncenewreleaseissettled"/}}Adaptions for phase 2, once new release is settled ===
133 133  
... ... @@ -137,7 +137,7 @@
137 137  ${EDITOR:-vi} debian/changelog src/etc/pba/builder.conf.template src/lib/build-functions.pl
138 138  
139 139  # commit
140 -git commit -m "Making new Debian distro ${NEWDN} default for DefaultDistribution in pba-builder.conf"
125 +svn commit -m "Making new Debian distro ${NEWREL} default for DefaultDistribution in pba-builder.conf"
141 141  
142 142  # release it
143 143  pba-release
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -968785981
1 +659141
URL
... ... @@ -1,1 +1,1 @@
1 -https://clazzes.atlassian.net/wiki/spaces/PBA/pages/968785981/Adapting PBA to new Debian Release
1 +https://clazzes.atlassian.net/wiki/spaces/PBA/pages/659141/Adapting PBA to new Debian Release