Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 1421 additions and 290 deletions
helpers/DATA/budgie-desktop-environment/logo-trisquel.svg 0 → 100644
View file @ 1be49b69
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="256"
height="256"
enable-background="new"
version="1.0"
id="svg6"
sodipodi:docname="logo-trisquel.svg"
inkscape:version="1.2.2 (1:1.2.2+202212051552+b0a8486541)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs10">
<linearGradient
id="vlpc"
x1="33.110001"
x2="25.370001"
y1="43.540001"
y2="2.4400001"
gradientUnits="userSpaceOnUse"
xlink:href="#vlpa" />
<linearGradient
id="vlpa">
<stop
style="stop-color:#fff"
offset="0"
id="stop497" />
<stop
style="stop-color:#fff;stop-opacity:0"
offset="1"
id="stop499" />
</linearGradient>
<linearGradient
id="vlpb"
x1="29.85"
x2="21.799999"
y1="50.400002"
y2="15.47"
gradientUnits="userSpaceOnUse"
xlink:href="#vlpa" />
</defs>
<sodipodi:namedview
id="namedview8"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.76603235"
inkscape:cx="383.7958"
inkscape:cy="100.51795"
inkscape:window-width="1918"
inkscape:window-height="1008"
inkscape:window-x="1366"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg6" />
<g
transform="matrix(4.1197806,0,0,4.1647007,29.339022,31.597072)"
id="g514">
<path
d="m 27.87,43.71 c -1.113,-0.1508 -2.337,-0.4496 -2.88,-0.7032 -1.256,-0.5861 -2.457,-1.418 -2.886,-1.999 -0.1122,-0.1521 -0.3907,-0.4236 -0.6189,-0.6033 -0.9071,-0.7146 -1.437,-1.467 -2.518,-3.576 -0.1228,-0.2396 -0.5067,-2.179 -0.6479,-3.275 -0.1116,-0.8656 -0.1027,-2.595 0.01758,-3.386 0.1492,-0.9822 0.454,-2.274 0.6016,-2.55 0.1243,-0.2322 0.433,-1.232 0.529,-1.713 0.03626,-0.1818 0.1176,-0.3943 0.1807,-0.4722 0.06314,-0.07791 0.1935,-0.4179 0.2896,-0.7555 0.09614,-0.3376 0.3202,-0.9081 0.498,-1.268 0.3981,-0.8055 0.5852,-1.406 0.5866,-1.881 5.72e-4,-0.1998 0.07085,-0.6034 0.1562,-0.897 0.209,-0.7188 0.1284,-2.743 -0.1396,-3.509 -0.2036,-0.5819 -0.7008,-1.559 -1.223,-2.404 -1.082,-1.751 -4.176,-3.905 -6.017,-4.19 -0.7057,-0.1092 -3.042,0.01163 -4.046,0.2092 -0.8596,0.1691 -1.669,0.5453 -2.084,0.9685 -1.065,1.085 -1.687,1.818 -1.932,2.276 -0.3536,0.6608 -0.5729,1.674 -0.6331,2.926 -0.06837,1.423 -0.00892,1.72 0.6221,3.112 0.5325,1.174 1.965,2.361 3.54,2.933 0.7354,0.2671 1.015,0.3166 2.078,0.3675 1.465,0.07027 2.089,-0.03592 2.746,-0.467 0.2558,-0.1679 0.6563,-0.4177 0.8901,-0.5549 1.067,-0.6266 1.624,-1.808 1.62,-3.435 -0.0028,-1.008 -0.3621,-1.919 -0.9709,-2.462 -0.3786,-0.3374 -1.714,-1.141 -2.102,-1.265 -0.6762,-0.2158 -1.548,-0.07892 -2.479,0.3891 -0.4531,0.2278 -0.9044,0.5245 -1.003,0.6593 -0.09841,0.1348 -0.3213,0.6235 -0.4953,1.086 -0.174,0.4626 -0.3513,0.8411 -0.3939,0.8411 -0.1692,0 -0.1258,-0.7336 0.07669,-1.297 0.2897,-0.806 0.5806,-1.225 1.154,-1.664 0.6469,-0.4944 1.281,-0.7389 2.138,-0.8243 1.115,-0.111 1.289,-0.0798 2.253,0.4032 1.122,0.5619 1.461,0.8933 2.014,1.969 0.661,1.284 0.742,1.638 0.5954,2.599 -0.1666,1.093 -0.541,2.197 -0.977,2.88 -0.3975,0.6233 -1.138,1.191 -2.47,1.893 -0.9548,0.5031 -1.281,0.5909 -2.55,0.6869 -1.389,0.105 -2.198,0.01486 -3.258,-0.3629 -0.4675,-0.1666 -1.049,-0.3599 -1.292,-0.4294 -0.3241,-0.09271 -0.7433,-0.3804 -1.571,-1.078 -1.421,-1.197 -1.649,-1.585 -1.925,-3.265 -0.1024,-0.6233 -0.1996,-1.439 -0.216,-1.812 -0.01637,-0.3733 -0.05626,-0.7215 -0.08866,-0.7739 -0.06776,-0.1096 0.08948,-2.008 0.2473,-2.986 0.1301,-0.806 0.1896,-0.9285 1.119,-2.305 0.5517,-0.817 0.9145,-1.24 1.43,-1.668 1.667,-1.384 2.756,-1.958 4.649,-2.45 1.313,-0.341 1.316,-0.3414 2.928,-0.2986 1.704,0.04528 2.612,0.1517 3.224,0.3783 4.143,1.532 5.777,2.874 7.9,6.485 0.6788,1.155 1.327,1.98 2.498,3.182 0.8619,0.8845 1.138,1.106 1.688,1.358 0.8872,0.4051 1.925,0.5526 3.916,0.5567 1.896,0.0038 2.614,-0.1398 3.441,-0.6886 0.2629,-0.1745 0.69,-0.4111 0.9491,-0.5256 0.2591,-0.1145 0.5565,-0.2852 0.6611,-0.3791 0.1045,-0.09396 0.4238,-0.2936 0.7095,-0.4436 0.656,-0.3444 1.422,-1.112 1.701,-1.705 0.3367,-0.7145 0.8519,-1.563 1.137,-1.874 0.1946,-0.2118 0.2843,-0.4411 0.3554,-0.9086 0.05227,-0.3439 0.1842,-0.8 0.2931,-1.014 0.2738,-0.5367 0.3664,-1.671 0.1678,-2.055 -0.08092,-0.1565 -0.208,-0.6071 -0.2825,-1.001 -0.2643,-1.4 -1.649,-3.032 -3.238,-3.817 -0.5763,-0.2848 -0.8207,-0.3455 -1.721,-0.427 -1.871,-0.1695 -3.241,0.1193 -4.32,0.9107 -1.02,0.7479 -1.46,1.117 -1.46,1.223 0,0.1117 -0.4698,0.6605 -0.6195,0.7236 -0.2073,0.08749 -0.6082,0.7537 -0.6082,1.011 0,0.1527 -0.08309,0.4654 -0.1846,0.695 -0.3872,0.8754 -0.3193,1.584 0.2924,3.054 0.348,0.8359 0.4546,1.031 0.7997,1.464 0.4626,0.5803 0.949,0.8492 1.811,1.001 1.002,0.1767 1.504,0.164 2.139,-0.05435 1.255,-0.4316 2.128,-1.168 2.579,-2.174 0.2031,-0.4528 0.2281,-0.6226 0.195,-1.324 -0.03327,-0.7054 -0.07788,-0.8748 -0.3606,-1.369 -0.1775,-0.3104 -0.4876,-0.7435 -0.6892,-0.9625 -0.2016,-0.2189 -0.3518,-0.4424 -0.3337,-0.4965 0.05236,-0.1571 1.002,0.5356 1.302,0.9495 0.4599,0.6348 0.6076,1.272 0.5402,2.331 -0.07399,1.162 -0.3913,1.842 -1.289,2.76 -0.6924,0.7082 -1.388,1.049 -2.549,1.248 -0.9447,0.162 -2.144,-0.05862 -2.902,-0.5337 -0.9182,-0.5759 -1.49,-1.166 -2.012,-2.076 -0.4286,-0.7475 -0.5091,-0.9787 -0.7073,-2.031 -0.2361,-1.253 -0.2357,-2.276 0.0012,-2.556 0.06579,-0.07791 0.1696,-0.3864 0.2308,-0.6856 0.06114,-0.2992 0.2066,-0.6604 0.3232,-0.8027 0.1166,-0.1423 0.3484,-0.5454 0.5151,-0.8956 0.2452,-0.5153 0.3747,-0.6734 0.6782,-0.8283 0.2063,-0.1053 0.3752,-0.2337 0.3752,-0.2855 0,-0.0518 0.1454,-0.1634 0.3232,-0.2482 0.1778,-0.08476 0.3439,-0.2334 0.3693,-0.3304 0.02719,-0.104 0.2721,-0.2754 0.5976,-0.4181 0.3033,-0.133 0.7828,-0.3502 1.066,-0.4827 0.2827,-0.1324 1.069,-0.378 1.747,-0.5458 1.172,-0.29 1.289,-0.3016 2.366,-0.2376 1.082,0.06427 1.158,0.08271 1.689,0.4082 0.3058,0.1875 0.7096,0.3906 0.8972,0.4513 0.1876,0.06075 0.6734,0.349 1.079,0.6405 0.4061,0.2915 0.8804,0.616 1.054,0.721 0.1736,0.105 0.596,0.4782 0.9386,0.8293 0.711,0.7287 1.457,2.087 1.702,3.101 0.08009,0.3306 0.2304,0.8986 0.3341,1.262 0.1612,0.5657 0.1802,0.8314 0.1315,1.842 -0.1517,3.146 -1.222,5.568 -3.294,7.454 -0.2597,0.2365 -0.7808,0.7367 -1.158,1.112 -0.7632,0.7586 -1.674,1.385 -2.809,1.932 -0.4155,0.2004 -0.9917,0.4883 -1.28,0.6398 -0.8821,0.4629 -2.231,0.667 -4.409,0.667 -2.13,0 -2.367,0.03229 -4.812,0.6569 -0.8747,0.2235 -1.162,0.345 -1.667,0.7053 -0.8538,0.6092 -1.839,1.878 -2.608,3.36 -0.1213,0.2337 -0.2966,0.51 -0.3894,0.6139 -0.3077,0.3444 -0.5456,1.051 -0.5621,1.669 -0.04062,1.523 0.02199,4.224 0.1058,4.564 0.13,0.5278 0.372,1.083 0.6177,1.417 0.3185,0.4325 0.8508,1.405 0.975,1.781 0.06666,0.202 0.2906,0.4866 0.561,0.713 0.2475,0.2072 0.5719,0.5526 0.7208,0.7675 0.3237,0.4671 1.494,1.102 2.195,1.19 0.2456,0.03104 0.5332,0.1102 0.6392,0.176 0.106,0.06575 0.4247,0.1676 0.7083,0.2263 0.6149,0.1273 2.007,-0.04731 2.81,-0.3525 0.4938,-0.1876 1.659,-0.8685 2.279,-1.332 0.4649,-0.3474 1.098,-1.247 1.285,-1.824 0.08794,-0.2726 0.2119,-0.5807 0.2753,-0.6845 0.3271,-0.5351 0.4039,-1.624 0.2477,-3.508 -0.05986,-0.7221 -0.1371,-1.071 -0.3134,-1.417 -0.1287,-0.252 -0.3323,-0.6631 -0.4525,-0.9135 -0.3679,-0.7664 -2.139,-2.049 -2.85,-2.063 -0.1184,-0.0024 -0.5003,-0.06373 -0.8486,-0.1362 -0.6689,-0.1391 -1.645,-0.06897 -2.049,0.1473 -0.4968,0.2659 -1.131,0.7412 -1.538,1.152 -0.361,0.3648 -0.4874,0.5887 -0.6844,1.213 -0.2262,0.7162 -0.2363,0.8276 -0.1569,1.741 0.09698,1.117 0.2873,1.633 0.8184,2.221 0.4236,0.4689 0.7845,0.6658 1.74,0.95 0.6943,0.2064 1.351,0.2198 1.96,0.04024 0.3577,-0.1055 0.236,0.109 -0.1643,0.2895 -0.5654,0.255 -1.901,0.1575 -2.783,-0.2031 -0.8817,-0.3607 -1.65,-1.073 -2.058,-1.908 -0.2943,-0.6016 -0.3069,-0.6736 -0.3069,-1.761 0,-1.081 0.01347,-1.159 0.2915,-1.7 0.1603,-0.3117 0.3895,-0.7578 0.5093,-0.9914 0.1198,-0.2336 0.4675,-0.6653 0.7726,-0.9593 0.4504,-0.4339 0.6923,-0.5821 1.285,-0.7872 1.632,-0.5646 3.618,-0.4182 4.838,0.3566 1.116,0.7085 2.094,1.533 2.467,2.078 0.6837,1.002 1.178,2.186 1.25,2.995 0.03466,0.3896 0.1015,1.081 0.1486,1.537 0.08071,0.7814 0.06696,0.9028 -0.2407,2.125 -0.4805,1.909 -0.7433,2.416 -1.677,3.236 -0.422,0.371 -0.9255,0.7558 -1.119,0.8552 -0.1933,0.09932 -0.4908,0.3004 -0.6611,0.447 -0.4616,0.3972 -1.338,0.8658 -1.619,0.8658 -0.136,0 -0.5133,0.1014 -0.8385,0.2253 -0.6424,0.2448 -1.835,0.5371 -2.116,0.5187 -0.09646,-0.0063 -0.5579,-0.0633 -1.025,-0.1266 z"
style="opacity:0.5021;fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linejoin:round"
id="path506" />
<path
d="m 27.87,43.71 c -1.113,-0.1508 -2.337,-0.4496 -2.88,-0.7032 -1.256,-0.5861 -2.457,-1.418 -2.886,-1.999 -0.1122,-0.1521 -0.3907,-0.4236 -0.6189,-0.6033 -0.9071,-0.7146 -1.437,-1.467 -2.518,-3.576 -0.1228,-0.2396 -0.5067,-2.179 -0.6479,-3.275 -0.1116,-0.8656 -0.1027,-2.595 0.01758,-3.386 0.1492,-0.9822 0.454,-2.274 0.6016,-2.55 0.1243,-0.2322 0.433,-1.232 0.529,-1.713 0.03626,-0.1818 0.1176,-0.3943 0.1807,-0.4722 0.06314,-0.07791 0.1935,-0.4179 0.2896,-0.7555 0.09614,-0.3376 0.3202,-0.9081 0.498,-1.268 0.3981,-0.8055 0.5852,-1.406 0.5866,-1.881 5.72e-4,-0.1998 0.07085,-0.6034 0.1562,-0.897 0.209,-0.7188 0.1284,-2.743 -0.1396,-3.509 -0.2036,-0.5819 -0.7008,-1.559 -1.223,-2.404 -1.082,-1.751 -4.176,-3.905 -6.017,-4.19 -0.7057,-0.1092 -3.042,0.01163 -4.046,0.2092 -0.8596,0.1691 -1.669,0.5453 -2.084,0.9685 -1.065,1.085 -1.687,1.818 -1.932,2.276 -0.3536,0.6608 -0.5729,1.674 -0.6331,2.926 -0.06837,1.423 -0.00892,1.72 0.6221,3.112 0.5325,1.174 1.965,2.361 3.54,2.933 0.7354,0.2671 1.015,0.3166 2.078,0.3675 1.465,0.07027 2.089,-0.03592 2.746,-0.467 0.2558,-0.1679 0.6563,-0.4177 0.8901,-0.5549 1.067,-0.6266 1.624,-1.808 1.62,-3.435 -0.0028,-1.008 -0.3621,-1.919 -0.9709,-2.462 -0.3786,-0.3374 -1.714,-1.141 -2.102,-1.265 -0.6762,-0.2158 -1.548,-0.07892 -2.479,0.3891 -0.4531,0.2278 -0.9044,0.5245 -1.003,0.6593 -0.09841,0.1348 -0.3213,0.6235 -0.4953,1.086 -0.174,0.4626 -0.3513,0.8411 -0.3939,0.8411 -0.1692,0 -0.1258,-0.7336 0.07669,-1.297 0.2897,-0.806 0.5806,-1.225 1.154,-1.664 0.6469,-0.4944 1.281,-0.7389 2.138,-0.8243 1.115,-0.111 1.289,-0.0798 2.253,0.4032 1.122,0.5619 1.461,0.8933 2.014,1.969 0.661,1.284 0.742,1.638 0.5954,2.599 -0.1666,1.093 -0.541,2.197 -0.977,2.88 -0.3975,0.6233 -1.138,1.191 -2.47,1.893 -0.9548,0.5031 -1.281,0.5909 -2.55,0.6869 -1.389,0.105 -2.198,0.01486 -3.258,-0.3629 -0.4675,-0.1666 -1.049,-0.3599 -1.292,-0.4294 -0.3241,-0.09271 -0.7433,-0.3804 -1.571,-1.078 -1.421,-1.197 -1.649,-1.585 -1.925,-3.265 -0.1024,-0.6233 -0.1996,-1.439 -0.216,-1.812 -0.01637,-0.3733 -0.05626,-0.7215 -0.08866,-0.7739 -0.06776,-0.1096 0.08948,-2.008 0.2473,-2.986 0.1301,-0.806 0.1896,-0.9285 1.119,-2.305 0.5517,-0.817 0.9145,-1.24 1.43,-1.668 1.667,-1.384 2.756,-1.958 4.649,-2.45 1.313,-0.341 1.316,-0.3414 2.928,-0.2986 1.704,0.04528 2.612,0.1517 3.224,0.3783 4.143,1.532 5.777,2.874 7.9,6.485 0.6788,1.155 1.327,1.98 2.498,3.182 0.8619,0.8845 1.138,1.106 1.688,1.358 0.8872,0.4051 1.925,0.5526 3.916,0.5567 1.896,0.0038 2.614,-0.1398 3.441,-0.6886 0.2629,-0.1745 0.69,-0.4111 0.9491,-0.5256 0.2591,-0.1145 0.5565,-0.2852 0.6611,-0.3791 0.1045,-0.09396 0.4238,-0.2936 0.7095,-0.4436 0.656,-0.3444 1.422,-1.112 1.701,-1.705 0.3367,-0.7145 0.8519,-1.563 1.137,-1.874 0.1946,-0.2118 0.2844,-0.4411 0.3554,-0.9086 0.05227,-0.3439 0.1842,-0.8 0.2931,-1.014 0.2738,-0.5367 0.3664,-1.671 0.1678,-2.055 -0.08092,-0.1565 -0.208,-0.6071 -0.2825,-1.001 -0.2643,-1.4 -1.649,-3.032 -3.238,-3.817 -0.5763,-0.2848 -0.8208,-0.3455 -1.721,-0.427 -1.871,-0.1695 -3.241,0.1193 -4.32,0.9107 -1.02,0.7479 -1.46,1.117 -1.46,1.223 0,0.1117 -0.4698,0.6605 -0.6195,0.7236 -0.2073,0.08749 -0.6082,0.7537 -0.6082,1.011 0,0.1527 -0.08309,0.4654 -0.1846,0.695 -0.3872,0.8754 -0.3193,1.584 0.2924,3.054 0.348,0.8359 0.4546,1.031 0.7997,1.464 0.4626,0.5803 0.949,0.8492 1.811,1.001 1.002,0.1767 1.504,0.164 2.139,-0.05435 1.255,-0.4316 2.128,-1.168 2.579,-2.174 0.2031,-0.4528 0.2281,-0.6226 0.195,-1.324 -0.03327,-0.7054 -0.07788,-0.8748 -0.3606,-1.369 -0.1775,-0.3104 -0.4876,-0.7435 -0.6892,-0.9625 -0.2016,-0.2189 -0.3518,-0.4424 -0.3337,-0.4965 0.05236,-0.1571 1.002,0.5356 1.302,0.9495 0.4599,0.6348 0.6076,1.272 0.5402,2.331 -0.07398,1.162 -0.3913,1.842 -1.289,2.76 -0.6924,0.7082 -1.388,1.049 -2.549,1.248 -0.9447,0.162 -2.144,-0.05862 -2.902,-0.5337 -0.9182,-0.5759 -1.49,-1.166 -2.012,-2.076 -0.4286,-0.7475 -0.5091,-0.9787 -0.7073,-2.031 -0.2361,-1.253 -0.2357,-2.276 0.0012,-2.556 0.06579,-0.07791 0.1696,-0.3864 0.2308,-0.6856 0.06114,-0.2992 0.2066,-0.6604 0.3232,-0.8027 0.1166,-0.1423 0.3484,-0.5454 0.5151,-0.8956 0.2452,-0.5153 0.3747,-0.6734 0.6782,-0.8283 0.2063,-0.1053 0.3752,-0.2337 0.3752,-0.2855 0,-0.0518 0.1454,-0.1634 0.3232,-0.2482 0.1778,-0.08476 0.3439,-0.2334 0.3693,-0.3304 0.02719,-0.104 0.2721,-0.2754 0.5976,-0.4181 0.3033,-0.133 0.7828,-0.3502 1.066,-0.4827 0.2827,-0.1324 1.069,-0.378 1.747,-0.5458 1.172,-0.29 1.289,-0.3016 2.366,-0.2376 1.082,0.06427 1.158,0.08271 1.689,0.4082 0.3058,0.1875 0.7096,0.3906 0.8972,0.4513 0.1876,0.06075 0.6734,0.349 1.079,0.6405 0.4061,0.2915 0.8804,0.616 1.054,0.721 0.1736,0.105 0.596,0.4782 0.9386,0.8293 0.711,0.7287 1.457,2.087 1.702,3.101 0.08008,0.3306 0.2304,0.8986 0.334,1.262 0.1612,0.5657 0.1802,0.8314 0.1315,1.842 -0.1517,3.146 -1.222,5.568 -3.294,7.454 -0.2597,0.2365 -0.7808,0.7367 -1.158,1.112 -0.7632,0.7586 -1.674,1.385 -2.809,1.932 -0.4155,0.2004 -0.9916,0.4883 -1.28,0.6398 -0.8821,0.4629 -2.231,0.667 -4.409,0.667 -2.13,0 -2.367,0.03229 -4.812,0.6569 -0.8747,0.2235 -1.162,0.345 -1.667,0.7053 -0.8538,0.6092 -1.839,1.878 -2.608,3.36 -0.1213,0.2337 -0.2966,0.51 -0.3894,0.6139 -0.3077,0.3444 -0.5456,1.051 -0.5621,1.669 -0.04062,1.523 0.02199,4.224 0.1058,4.564 0.13,0.5278 0.372,1.083 0.6177,1.417 0.3185,0.4325 0.8508,1.405 0.975,1.781 0.06666,0.202 0.2906,0.4866 0.561,0.713 0.2475,0.2072 0.5719,0.5526 0.7208,0.7675 0.3237,0.4671 1.494,1.102 2.195,1.19 0.2456,0.03104 0.5332,0.1102 0.6392,0.176 0.106,0.06575 0.4247,0.1676 0.7083,0.2263 0.6149,0.1273 2.007,-0.04731 2.81,-0.3525 0.4938,-0.1876 1.659,-0.8685 2.279,-1.332 0.4649,-0.3474 1.098,-1.247 1.285,-1.824 0.08794,-0.2726 0.2119,-0.5807 0.2753,-0.6845 0.3271,-0.5351 0.4039,-1.624 0.2477,-3.508 -0.05986,-0.7221 -0.1371,-1.071 -0.3134,-1.417 -0.1287,-0.252 -0.3323,-0.6631 -0.4525,-0.9135 -0.3679,-0.7664 -2.139,-2.049 -2.85,-2.063 -0.1184,-0.0024 -0.5003,-0.06373 -0.8486,-0.1362 -0.6689,-0.1391 -1.645,-0.06897 -2.049,0.1473 -0.4968,0.2659 -1.131,0.7412 -1.538,1.152 -0.361,0.3648 -0.4874,0.5887 -0.6844,1.213 -0.2262,0.7162 -0.2363,0.8276 -0.1569,1.741 0.09698,1.117 0.2873,1.633 0.8184,2.221 0.4236,0.4689 0.7845,0.6658 1.74,0.95 0.6943,0.2064 1.351,0.2198 1.96,0.04024 0.3577,-0.1055 0.236,0.109 -0.1643,0.2895 -0.5654,0.255 -1.901,0.1575 -2.783,-0.2031 -0.8817,-0.3607 -1.65,-1.073 -2.058,-1.908 -0.2943,-0.6016 -0.3069,-0.6736 -0.3069,-1.761 0,-1.081 0.01347,-1.159 0.2915,-1.7 0.1603,-0.3117 0.3895,-0.7578 0.5093,-0.9914 0.1198,-0.2336 0.4675,-0.6653 0.7726,-0.9593 0.4504,-0.4339 0.6923,-0.5821 1.285,-0.7872 1.632,-0.5646 3.618,-0.4182 4.838,0.3566 1.116,0.7085 2.094,1.533 2.467,2.078 0.6837,1.002 1.178,2.186 1.25,2.995 0.03466,0.3896 0.1015,1.081 0.1486,1.537 0.08071,0.7814 0.06696,0.9028 -0.2407,2.125 -0.4805,1.909 -0.7433,2.416 -1.677,3.236 -0.422,0.371 -0.9255,0.7558 -1.119,0.8552 -0.1933,0.09932 -0.4908,0.3004 -0.6611,0.447 -0.4616,0.3972 -1.338,0.8658 -1.619,0.8658 -0.136,0 -0.5133,0.1014 -0.8385,0.2253 -0.6424,0.2448 -1.835,0.5371 -2.116,0.5187 -0.09646,-0.0063 -0.5579,-0.0633 -1.025,-0.1266 z"
style="fill:#ffffff"
id="path508" />
<path
d="m 20.16,24.12 21.31,-4.844 c 0.02465,-0.02278 0.07241,-0.07432 0.09375,-0.09375 2.072,-1.887 3.13,-4.291 3.281,-7.438 0.04872,-1.01 0.03622,-1.278 -0.125,-1.844 -0.1036,-0.3636 -0.2637,-0.9507 -0.3438,-1.281 -0.2455,-1.013 -0.9765,-2.365 -1.688,-3.094 -0.3426,-0.3511 -0.7639,-0.7075 -0.9375,-0.8125 -0.1736,-0.105 -0.6564,-0.4585 -1.062,-0.75 -0.4061,-0.2915 -0.8749,-0.5642 -1.062,-0.625 -0.1876,-0.06075 -0.6004,-0.25 -0.9062,-0.4375 -0.5309,-0.3255 -0.6054,-0.3732 -1.688,-0.4375 -1.078,-0.064 -1.203,-0.03996 -2.375,0.25 -0.6782,0.1677 -1.467,0.4301 -1.75,0.5625 -0.2827,0.1324 -0.7592,0.3357 -1.062,0.4688 -0.3255,0.1427 -0.5666,0.3022 -0.5938,0.4062 -0.02535,0.09693 -0.1972,0.259 -0.375,0.3438 -0.1777,0.08476 -0.3125,0.1983 -0.3125,0.25 0,0.05173 -0.1687,0.176 -0.375,0.2812 -0.3036,0.1549 -0.4423,0.3285 -0.6875,0.8438 -0.1667,0.3503 -0.3834,0.7327 -0.5,0.875 -0.1166,0.1423 -0.2826,0.5133 -0.3438,0.8125 -0.06114,0.2992 -0.153,0.6096 -0.2188,0.6875 -0.2368,0.2805 -0.2361,1.309 0,2.562 0.1982,1.052 0.2589,1.284 0.6875,2.031 0.5217,0.9098 1.113,1.487 2.031,2.062 0.7574,0.4751 1.962,0.6932 2.906,0.5312 1.161,-0.199 1.839,-0.5418 2.531,-1.25 0.8974,-0.9179 1.239,-1.588 1.312,-2.75 0.0674,-1.059 -0.1026,-1.709 -0.5625,-2.344 -0.2998,-0.4139 -1.229,-1.095 -1.281,-0.9375 -0.01805,0.05415 0.1109,0.2811 0.3125,0.5 0.2016,0.2189 0.51,0.6583 0.6875,0.9688 0.2827,0.4946 0.3417,0.6384 0.375,1.344 0.03308,0.7018 0.01561,0.8909 -0.1875,1.344 -0.4515,1.007 -1.339,1.725 -2.594,2.156 -0.6345,0.2183 -1.123,0.2392 -2.125,0.0625 -0.8615,-0.1519 -1.35,-0.4197 -1.812,-1 -0.3451,-0.4328 -0.4645,-0.6329 -0.8125,-1.469 -0.6118,-1.469 -0.6685,-2.156 -0.2812,-3.031 0.1015,-0.2296 0.1875,-0.5661 0.1875,-0.7188 0,-0.2571 0.3864,-0.9125 0.5938,-1 0.1497,-0.06315 0.625,-0.6071 0.625,-0.7188 0,-0.1066 0.4491,-0.4709 1.469,-1.219 1.079,-0.7914 2.441,-1.107 4.312,-0.9375 0.9004,0.08156 1.142,0.1527 1.719,0.4375 1.589,0.7853 2.986,2.413 3.25,3.812 0.07444,0.3943 0.2003,0.8435 0.2812,1 0.1986,0.3841 0.08631,1.526 -0.1875,2.062 -0.109,0.2136 -0.229,0.6874 -0.2812,1.031 -0.07103,0.4674 -0.1803,0.6944 -0.375,0.9062 -0.2855,0.3107 -0.7883,1.16 -1.125,1.875 -0.2796,0.5932 -1.031,1.343 -1.688,1.688 -0.2857,0.15 -0.6142,0.3435 -0.7188,0.4375 -0.1045,0.09396 -0.3972,0.2604 -0.6562,0.375 -0.2591,0.1146 -0.7058,0.3567 -0.9688,0.5312 -0.8268,0.5488 -1.541,0.6913 -3.438,0.6875 -1.991,-0.004 -3.019,-0.1574 -3.906,-0.5625 -0.5505,-0.2514 -0.8256,-0.4593 -1.688,-1.344 -1.171,-1.202 -1.821,-2.033 -2.5,-3.188 -2.123,-3.611 -3.763,-4.936 -7.906,-6.469 -0.6126,-0.2266 -1.514,-0.3297 -3.219,-0.375 -1.612,-0.04281 -1.625,-0.05978 -2.938,0.2812 -1.893,0.4919 -2.958,1.085 -4.625,2.469 -0.5156,0.428 -0.8858,0.8393 -1.438,1.656 -0.9296,1.377 -0.9949,1.507 -1.125,2.312 -0.1578,0.9776 -0.3178,2.859 -0.25,2.969 0.0324,0.05241 0.07738,0.408 0.09375,0.7812 0.01637,0.3733 0.1163,1.189 0.2188,1.812 0.2761,1.68 0.4856,2.053 1.906,3.25 0.8278,0.6977 1.27,1.001 1.594,1.094 0.2431,0.06954 0.8138,0.2709 1.281,0.4375 1.06,0.3778 1.861,0.4488 3.25,0.3438 1.269,-0.09598 1.608,-0.1844 2.562,-0.6875 1.331,-0.7014 2.071,-1.252 2.469,-1.875 0.4359,-0.6836 0.8022,-1.782 0.9688,-2.875 0.1466,-0.9615 0.06728,-1.341 -0.5938,-2.625 -0.5538,-1.076 -0.8783,-1.407 -2,-1.969 -0.9642,-0.483 -1.135,-0.486 -2.25,-0.375 -0.8573,0.0854 -1.509,0.3181 -2.156,0.8125 -0.5738,0.4386 -0.8666,0.8503 -1.156,1.656 -0.2025,0.5634 -0.2317,1.313 -0.0625,1.312 0.04264,0 0.201,-0.3812 0.375,-0.8438 0.174,-0.4626 0.4016,-0.959 0.5,-1.094 0.09842,-0.1348 0.5469,-0.4284 1,-0.6562 0.9308,-0.468 1.824,-0.6221 2.5,-0.4062 0.3881,0.1239 1.715,0.9438 2.094,1.281 0.6088,0.5426 0.9659,1.461 0.9688,2.469 0.0045,1.626 -0.5581,2.811 -1.625,3.438 -0.2337,0.1373 -0.6192,0.3633 -0.875,0.5312 -0.6566,0.4311 -1.285,0.539 -2.75,0.4688 -1.062,-0.05096 -1.358,-0.07669 -2.094,-0.3438 -1.575,-0.5721 -2.999,-1.763 -3.531,-2.938 -0.631,-1.392 -0.6934,-1.702 -0.625,-3.125 0.06018,-1.252 0.2714,-2.277 0.625,-2.938 0.2452,-0.4581 0.8728,-1.165 1.938,-2.25 0.4151,-0.4231 1.234,-0.7996 2.094,-0.9688 1.004,-0.1976 3.326,-0.3279 4.031,-0.2188 1.841,0.2848 4.949,2.437 6.031,4.188 0.5224,0.845 1.015,1.824 1.219,2.406 0.2681,0.7662 0.3652,2.781 0.1562,3.5 -0.08534,0.2936 -0.1557,0.7065 -0.1562,0.9062 -0.0013,0.4758 -0.1956,1.07 -0.5938,1.875 -0.09976,0.2018 -0.1831,0.4625 -0.2812,0.7188 z"
style="opacity:0.7975;fill:#ffffff"
id="path510" />
<path
d="m 20.16,24.12 c -0.07674,0.2003 -0.1766,0.4143 -0.2188,0.5625 -0.09614,0.3376 -0.2181,0.6721 -0.2812,0.75 -0.06315,0.07791 -0.1512,0.287 -0.1875,0.4688 -0.09597,0.4812 -0.407,1.487 -0.5312,1.719 -0.1476,0.2759 -0.4445,1.549 -0.5938,2.531 -0.1202,0.7916 -0.1429,2.541 -0.03125,3.406 0.1413,1.095 0.5334,3.042 0.6562,3.281 1.081,2.109 1.593,2.848 2.5,3.562 0.2282,0.1798 0.5128,0.4417 0.625,0.5938 0.4282,0.5804 1.65,1.414 2.906,2 0.5433,0.2536 1.762,0.568 2.875,0.7188 0.4675,0.06332 0.9035,0.1187 1,0.125 0.281,0.01842 1.483,-0.2864 2.125,-0.5312 0.3252,-0.1239 0.7078,-0.2188 0.8438,-0.2188 0.281,0 1.163,-0.4778 1.625,-0.875 0.1703,-0.1465 0.4629,-0.3382 0.6562,-0.4375 0.1933,-0.09932 0.703,-0.4727 1.125,-0.8438 0.9333,-0.8206 1.176,-1.341 1.656,-3.25 0.3077,-1.222 0.3307,-1.344 0.25,-2.125 -0.04709,-0.4558 -0.1216,-1.142 -0.1562,-1.531 -0.07193,-0.8088 -0.5663,-1.998 -1.25,-3 -0.3722,-0.5453 -1.353,-1.354 -2.469,-2.062 -1.22,-0.7748 -3.181,-0.9396 -4.812,-0.375 -0.5928,0.2051 -0.8308,0.3473 -1.281,0.7812 -0.3051,0.294 -0.6614,0.7351 -0.7812,0.9688 -0.1198,0.2337 -0.3709,0.6883 -0.5312,1 -0.278,0.5404 -0.2813,0.6066 -0.2812,1.688 0,1.087 0.01819,1.148 0.3125,1.75 0.4087,0.8355 1.181,1.577 2.062,1.938 0.8815,0.3606 2.216,0.4425 2.781,0.1875 0.4003,-0.1805 0.5139,-0.3867 0.1562,-0.2812 -0.6091,0.1796 -1.274,0.1439 -1.969,-0.0625 -0.956,-0.2842 -1.295,-0.4686 -1.719,-0.9375 -0.5311,-0.5879 -0.7155,-1.102 -0.8125,-2.219 -0.07934,-0.9137 -0.06999,-1.034 0.1562,-1.75 0.1971,-0.6239 0.2952,-0.8539 0.6562,-1.219 0.4063,-0.4106 1.066,-0.8591 1.562,-1.125 0.4041,-0.2163 1.362,-0.2954 2.031,-0.1562 0.3484,0.07246 0.7254,0.1226 0.8438,0.125 0.7112,0.01469 2.507,1.296 2.875,2.062 0.1202,0.2504 0.3088,0.6542 0.4375,0.9062 0.1763,0.3453 0.2526,0.7154 0.3125,1.438 0.1562,1.885 0.07708,2.965 -0.25,3.5 -0.06349,0.1039 -0.1933,0.4149 -0.2812,0.6875 -0.1862,0.5772 -0.8163,1.465 -1.281,1.812 -0.6203,0.4635 -1.787,1.156 -2.281,1.344 -0.8032,0.3052 -2.198,0.4711 -2.812,0.3438 -0.2836,-0.05872 -0.5815,-0.153 -0.6875,-0.2188 -0.106,-0.06575 -0.4107,-0.1565 -0.6562,-0.1875 -0.7012,-0.08862 -1.864,-0.7204 -2.188,-1.188 -0.1489,-0.2149 -0.4712,-0.5428 -0.7188,-0.75 -0.2704,-0.2264 -0.4958,-0.5168 -0.5625,-0.7188 -0.1242,-0.3763 -0.6503,-1.349 -0.9688,-1.781 -0.2456,-0.3336 -0.495,-0.8784 -0.625,-1.406 -0.08381,-0.3404 -0.1344,-3.04 -0.09375,-4.562 0.01649,-0.6183 0.2548,-1.343 0.5625,-1.688 0.09284,-0.1039 0.2537,-0.36 0.375,-0.5938 0.769,-1.481 1.771,-2.766 2.625,-3.375 0.5049,-0.3603 0.7815,-0.4953 1.656,-0.7188 2.445,-0.6246 2.682,-0.6563 4.812,-0.6562 2.178,0 3.524,-0.1933 4.406,-0.6562 0.2886,-0.1515 0.8657,-0.4246 1.281,-0.625 1.135,-0.5473 2.049,-1.179 2.812,-1.938 0.3462,-0.3441 0.7872,-0.7768 1.062,-1.031 l -21.31,4.844 z"
style="opacity:0.3629;fill:#ffffff"
id="path512" />
</g>
</svg>
helpers/DATA/casper/set_liveuser_uid_1000.patch 0 → 100644
View file @ 1be49b69
diff --git a/bin/casper-snapshot b/bin/casper-snapshot
index ab075292..33243f63 100755
--- a/bin/casper-snapshot
+++ b/bin/casper-snapshot
@@ -33,7 +33,7 @@ VERSION=0.0.1
if [ -e /etc/casper.conf ]; then
. /etc/casper.conf
else
- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
HOSTNAME=$(hostname)
BUILD_SYSTEM="Debian"
fi
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index d6c75e66..c80e2058 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
sddm_session=QLubuntu.desktop
fi
cat >>/root/etc/sddm.conf <<EOF
-[Users]
-MinimumUid=999
-
[Autologin]
User=$USERNAME
Session=$sddm_session
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
index 8320e710..efbf5677 100755
--- a/scripts/casper-bottom/25adduser
+++ b/scripts/casper-bottom/25adduser
@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
db_set passwd/user-password-crypted U6aMy0wojraho
db_set passwd/user-fullname "$USERFULLNAME"
db_set passwd/username "$USERNAME"
-db_set passwd/user-uid 999
+# Per LP: #2004092, systemd uses 995-999
+db_set passwd/user-uid 1000
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
if [ ! -f /root/usr/bin/sddm ]; then
@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
fi
done
-# GDM
-if [ -d /root/etc/gdm3 ]; then
- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
-fi
-
# Kubuntu
if [ -f "/root/usr/bin/plasma-desktop" ]; then
if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
helpers/DATA/casper/set_trisquel_iso_suggestion.patch 0 → 100644
View file @ 1be49b69
--- a/scripts/casper 2023-02-13 23:53:18.908768968 -0600
+++ b/scripts/casper 2023-02-21 03:28:55.176581755 -0600
@@ -376,18 +376,18 @@
# maybe make livecd-rootfs embed something in the casper initrd?
case $PRETTY_NAME in
*development*)
- server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
- desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
+ server_url=""
+ desktop_url=""
;;
*)
case $DPKG_ARCH in
amd64)
- server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
- desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;;
*)
- server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
- desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;;
esac
;;
helpers/DATA/choose-mirror/rev_Makefile.patch 0 → 100644
View file @ 1be49b69
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
--- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/Makefile 2021-06-04 12:09:55.000000000 -0500
@@ -33,8 +33,8 @@
STRIP=strip
# Derivative distributions may want to change these.
-#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
-MASTERLIST=Mirrors.masterlist.trisquel
+MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MASTERLIST=Mirrors.masterlist
ifdef DEBUG
CFLAGS:=$(CFLAGS) -DDODEBUG
helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch 0 → 100644
View file @ 1be49b69
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
--- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in 2021-02-08 06:52:03.000000000 -0600
@@ -12,10 +12,14 @@
Type: select
Choices-C: ${CHOICES-C}
Choices: ${CHOICES}
-Default: _CODENAME_
-Description: Trisquel version to install:
- In Trisquel, this question is never asked, and is only for preseeding.
- Caveat emptor.
+# :sl2:
+_Description: Debian version to install:
+ Debian comes in several flavors. Stable is well-tested and rarely changes.
+ Unstable is untested and frequently changing. Testing is a middle ground,
+ that receives many of the new versions from unstable if they are not too
+ buggy.
+ .
+ Only flavors available on the selected mirror are listed.
Template: mirror/codename
Type: string
helpers/DATA/command-not-found/fix_test.patch 0 → 100644
View file @ 1be49b69
diff -ru source/CommandNotFound/db/tests/test_db.py source/CommandNotFound/db/tests/test_db.py_fix
--- source/CommandNotFound/db/tests/test_db.py 2021-12-08 04:53:19.000000000 -0600
+++ source/CommandNotFound/db/tests/test_db.py_fix 2022-08-26 01:26:06.984427040 -0500
@@ -11,7 +11,7 @@
from CommandNotFound.db.creator import DbCreator
from CommandNotFound.db.db import SqliteDatabase
-mock_commands_bionic_backports = """suite: bionic-backports
+mock_commands_etiona_backports = """suite: etiona-backports
component: main
arch: all
@@ -20,7 +20,7 @@
commands: script,wall,new-stuff-only-in-backports
"""
-mock_commands_bionic_proposed = """suite: bionic-proposed
+mock_commands_etiona_proposed = """suite: etiona-proposed
component: main
arch: all
@@ -29,7 +29,7 @@
commands: script,wall
"""
-mock_commands_bionic = """suite: bionic
+mock_commands_etiona = """suite: etiona
component: main
arch: all
@@ -65,7 +65,7 @@
ignore-commands: ignore-me
"""
-mock_commands_bionic_universe = """suite: bionic
+mock_commands_etiona_universe = """suite: etiona
component: universe
arch: all
@@ -84,7 +84,7 @@
shutil.rmtree(self.tmpdir)
def make_mock_commands_file(self, suite, content):
- path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.ubuntu.com_ubuntu_dists_%s_Commands-all" % suite)
+ path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.trisquel.org_trisquel_dists_%s_Commands-all" % suite)
try:
os.makedirs(os.path.dirname(path))
except OSError:
@@ -95,7 +95,7 @@
def test_create_trivial_db(self):
mock_commands_file = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_file])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -108,9 +108,9 @@
def test_create_multiple_dbs(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-proposed_main", mock_commands_bionic_proposed)
+ "etiona-proposed_main", mock_commands_etiona_proposed)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -131,9 +131,9 @@
def test_create_backports_excluded_dbs(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-backports_main", mock_commands_bionic_backports)
+ "etiona-backports_main", mock_commands_etiona_backports)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -146,7 +146,7 @@
def test_create_no_versions_does_not_crash(self):
mock_commands = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic.replace("version: 1.0\n", ""))
+ "etiona_main", mock_commands_etiona.replace("version: 1.0\n", ""))
cre = DbCreator([mock_commands])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -157,11 +157,8 @@
def test_create_priorities_work(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
- mock_commands_2 = self.make_mock_commands_file(
- "bionic_universe", mock_commands_bionic_universe)
- self.assertNotEqual(mock_commands_1, mock_commands_2)
- cre = DbCreator([mock_commands_1, mock_commands_2])
+ "etiona_main", mock_commands_etiona)
+ cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
# validate content
@@ -173,12 +170,11 @@
db.lookup("bzr"), [
("bzr1", "1.0", "main"),
("bzr2", "2.7", "main"),
- ("bzr-tng", "3.0", "universe"),
])
def test_priorities_bonus_works(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -193,7 +189,7 @@
def test_visible_pkgname_works(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -205,9 +201,9 @@
def test_create_multiple_no_unneeded_creates(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-proposed_main", mock_commands_bionic_proposed)
+ "etiona-proposed_main", mock_commands_etiona_proposed)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -220,7 +216,7 @@
def test_create_honors_ignore_comamnds(self):
mock_commands_file = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_file])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
helpers/DATA/command-not-found/no_extra_repos.patch 0 → 100644
View file @ 1be49b69
diff -ru source.orig/CommandNotFound/CommandNotFound.py source/CommandNotFound/CommandNotFound.py
--- source.orig/CommandNotFound/CommandNotFound.py 2021-12-08 05:53:19.000000000 -0500
+++ source/CommandNotFound/CommandNotFound.py 2023-06-09 16:52:12.675354733 -0400
@@ -227,8 +227,6 @@
else:
print("apt install %s" % packages[0][0], file=self.output_fd)
print(_("Please ask your administrator."))
- if not packages[0][2] in self.sources_list:
- print(_("You will have to enable the component called '%s'") % packages[0][2], file=self.output_fd)
self.output_fd.flush()
def sudo(self):
@@ -246,10 +244,7 @@
ver = " # version %s, or" % (package[1])
else:
ver = " # version %s" % (package[1])
- if package[2] in self.sources_list:
- print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
- else:
- print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver) + " (" + _("You will have to enable component called '%s'") % package[2] + ")", file=self.output_fd)
+ print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
if self.euid != 0 and not self.user_can_sudo:
print(_("Ask your administrator to install one of them."), file=self.output_fd)
self.output_fd.flush()
helpers/DATA/compton/compton-launcher deleted 100644 → 0
View file @ 119207ff
#!/bin/sh
[ $DESKTOP_SESSION = "trisquel-session" ] || exit 0
[ -f $HOME/.config/disable-compton ] && exit 0
FILE=/etc/compton.conf
[ -f $HOME/.config/compton.conf ] && FILE="$HOME/.config/compton.conf"
[ 0 != $(glxinfo |grep "renderer string:" |grep -v llvmpipe | wc -c) ] && exec compton --config $FILE &
helpers/DATA/compton/compton.conf
View file @ 1be49b69
......@@ -8,12 +8,11 @@
# GLX backend is typically much faster but depends on a sane driver.
backend = "glx";
#################################
#
# GLX backend
#
#################################
# Needed on some systems to avoid delay in changes of screen contents. (e.g. Pluma)
xrender-sync = true;
xrender-sync-fence = true;
# GLX backend: Avoid using stencil buffer, useful if you don’t have a stencil buffer.
glx-no-stencil = true;
# GLX backend: Copy unmodified regions from front buffer instead of redrawing them all.
......@@ -34,7 +33,6 @@ glx-copy-from-front = false;
# Recommended if it works.
# glx-no-rebind-pixmap = true;
# GLX backend: GLX buffer swap method we assume.
# Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
# undefined is the slowest and the safest, and the default value.
......@@ -60,15 +58,15 @@ no-dnd-shadow = true;
# Avoid drawing shadows on dock/panel windows.
no-dock-shadow = true;
# Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows.
clear-shadow = true;
clear-shadow = false;
# The blur radius for shadows. (default 12)
shadow-radius = 5;
shadow-radius = 10;
# The left offset for shadows. (default -15)
shadow-offset-x = -8;
shadow-offset-x = -12;
# The top offset for shadows. (default -15)
shadow-offset-y = -8;
shadow-offset-y = -12;
# The translucency for shadows. (default .75)
shadow-opacity = 0.6;
shadow-opacity = 0.4;
# Set if you want different colour shadows
# shadow-red = 0.0;
......@@ -79,8 +77,7 @@ shadow-opacity = 0.6;
# (most applications are fine, only apps that do weird things with xshapes or argb are affected).
# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
shadow-exclude = [
"argb",
#"! name~=''",
"! name~=''",
"name = 'Notification'",
"name = 'Plank'",
"name = 'Docky'",
......@@ -88,10 +85,7 @@ shadow-exclude = [
"name = 'xfce4-notifyd'",
"name *= 'VLC'",
"name *= 'compton'",
"name *= 'Chromium'",
"name *= 'Chrome'",
"name *= 'Firefox'",
"name *= 'Abrowser'",
"name *= 'IceCat'",
"name *= 'Totem'",
"name *= 'XBMC'",
......@@ -101,7 +95,8 @@ shadow-exclude = [
"class_g ?= 'Notify-osd'",
"class_g ?= 'Cairo-dock'",
"class_g ?= 'Xfce4-notifyd'",
"class_g ?= 'Xfce4-power-manager'"
"class_g ?= 'Xfce4-power-manager'",
"_GTK_FRAME_EXTENTS@:c"
];
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
shadow-ignore-shaped = false;
......@@ -112,7 +107,7 @@ shadow-ignore-shaped = false;
#
#################################
menu-opacity = 0.95;
menu-opacity = 1;
inactive-opacity = 1;
active-opacity = 1;
frame-opacity = 1;
......@@ -152,7 +147,7 @@ fade-out-step = 0.03;
# no-fading-openclose = true;
# Specify a list of conditions of windows that should not be faded.
fade-exclude = [ ];
fade-exclude = [ " window_type *= 'menu'" ];
#################################
#
......@@ -187,7 +182,7 @@ refresh-rate = 0;
# opengl-swc: Try to VSync with SGI_swap_control OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn’t have the effect of --sw-opti unlike other methods. Experimental.
# opengl-mswc: Try to VSync with MESA_swap_control OpenGL extension. Basically the same as opengl-swc above, except the extension we use.
# (Note some VSync methods may not be enabled at compile time.)
vsync = "opengl-swc";
vsync = "opengl";
# Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
# Reported to have no effect, though.
......@@ -229,7 +224,7 @@ wintypes:
# shadow: Give those windows shadow
shadow = false;
# opacity: Default opacity for the type of windows.
opacity = 0.85;
opacity = 1;
# focus: Whether to always consider windows of this type focused.
focus = true;
};
......
helpers/DATA/compton/trisquel-compton-switcher deleted 100644 → 0
View file @ 119207ff
#!/bin/bash
DONT_SUPPORT_3D="Your machine does not support 3D acceleration"
if [ $LANG = es_ES.UTF-8 ]; then
DONT_SUPPORT_3D="Su equipo no soporta aceleración 3D"
fi
# First, check if the computer
# supports 3D acceleration. If not, it
# it informs the user and then exits.
[ 0 = $(glxinfo |grep "renderer string:" |grep -v llvmpipe | wc -c) ] && zenity \
--info --text="$DONT_SUPPORT_3D" && exit 0
# Check if compton is currently running.
case "$(pgrep -u $USER compton | wc -w)" in
0) COMPTON_RUNNING=false
;;
1) COMPTON_RUNNING=true
;;
esac
if $COMPTON_RUNNING; then
COMPTON=true
DISCOMPTON=false
elif ! $COMPTON_RUNNING; then
COMPTON=false
DISCOMPTON=true
fi
# The text that will be showed to the user.
TEXT="Use Compton compositor if 3d acceleration available"
TITLE="Choose between enabling or disabling Compton"
COMPTON_ENABLED="Compton enabled"
COMPTON_DISABLED="Compton disabled"
INFO="Compton is already running"
#Checks the languange of the system (more can be added in the future) and displays the text corresponding to the language selected.
if [ $LANG = es_ES.UTF-8 ]; then
TEXT="Usar el compositor Compton si el equipo soporta aceleración 3D"
TITLE="Seleccionar entre habilitar o deshabilitar los efectos de Compton"
COMPTON_ENABLED="Compton habilitado"
COMPTON_DISABLED="Compton deshabilitado"
INFO="Compton ya se encuentra en ejecución"
fi
# Zenity is summoned to interact with the user.
# The XOR with the "exit 0" means that the script
# will exit with no error if zenity is "canceled"
# (user clicking on the "cancel" button, for
# instance).
ans=$(zenity --list --hide-header\
--title "$TITLE"\
--text "$TEXT"\
--radiolist\
--column "" --column ""\
$COMPTON "$COMPTON_ENABLED"\
$DISCOMPTON "$COMPTON_DISABLED" || exit 0)
# Evaluate if compton is runnning or not, if it does,
# warn the user if he/she tries to run compton again
# or disable the compositor if he/she select to disable
# it. If compton is not running, run and enable it if
# the user selects to do so:
# .-----------------.
# | |
# | |
# | Compton running |
# | |
# | |
# '-----------------'
# |
# | .-----------------. .-----------------.
# |-->| User selects no |-->| Disable compton |
# | '-----------------' '-----------------'
# | .------------------. .-----------------.
# '-->| User selects yes |->| Inform the user |
# '------------------' '-----------------'
# .---------------------.
# | |
# | |
# | Compton not running |
# | |
# | |
# '---------------------'
# |
# | .-----------------. .------------.
# |-->| User selects no |-->| Do nothing |
# | '-----------------' '------------'
# | .------------------. .-----------------.
# '-->| User selects yes |-->| Enable compton |
# '------------------' '-----------------'
if $COMPTON_RUNNING # Compton running
then
if [[ $ans == $COMPTON_DISABLED ]]; then
touch $HOME/.config/disable-compton
killall compton
elif [[ $ans == $COMPTON_ENABLED ]]; then
zenity --info --text="$INFO"
fi
else # Compton not running
if [[ $ans == $COMPTON_ENABLED ]]; then
rm -f $HOME/.config/disable-compton
compton-launcher
else
exit 0
fi
fi
\ No newline at end of file
helpers/DATA/console-setup/modify_20console-setup.patch 0 → 100644
View file @ 1be49b69
diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer
--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer 2021-07-23 22:45:19.000000000 -0500
+++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer 2022-12-17 18:07:01.460681582 -0600
@@ -21,9 +21,8 @@
if ! db_get oem-config/enable || [ "$RET" != true ]; then
# create the required templates
debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb
-
- # mark the questions as seen
- for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
+ for template in \
+## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
do
echo keyboard-configuration $template seen true
done | chroot /target debconf-set-selections
helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch 0 → 100644
View file @ 1be49b69
Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include <pthread.h>
Author: Paul Wise <pabs@debian.org>
Reviewed-By: Axel Beckert <abe@debian.org>
Bug-Debian: https://bugs.debian.org/1015925
Bug: https://bugs.debian.org/1015925
--- a/src/cwidget/generic/threads/threads.h
+++ b/src/cwidget/generic/threads/threads.h
@@ -26,6 +26,7 @@
#define THREADS_H
#include <errno.h>
+#include <pthread.h>
#include <cwidget/generic/util/exception.h>
namespace cwidget
helpers/DATA/db/007-mt19937db.c_license.patch deleted 100644 → 0
View file @ 119207ff
Description: mt19937db.c license should include the GPL
This file is distributed from upstream Berkeley DB under the Artistic
License (no version specified), althouth it was later released by the
original author under both GPL2+ and BSD.
.
References:
http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
.
Author: Ruben Rodriguez <ruben@trisquel.info>
--- db-5.1.25.orig/src/crypto/mersenne/mt19937db.c
+++ db-5.1.25/src/crypto/mersenne/mt19937db.c
@@ -16,16 +16,27 @@
/* Coded by Takuji Nishimura, considering the suggestions by */
/* Topher Cooper and Marc Rieffel in July-Aug. 1997. */
-/* This library is free software under the Artistic license: */
-/* see the file COPYING distributed together with this code. */
-/* For the verification of the code, its output sequence file */
-/* mt19937int.out is attached (2001/4/2) */
-
/* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
/* Any feedback is very welcome. For any question, comments, */
/* see http://www.math.keio.ac.jp/matumoto/emt.html or email */
/* matumoto@math.keio.ac.jp */
+/* This library is free software; you can redistribute it and/or */
+/* modify it under the terms of the GNU Library General Public */
+/* License as published by the Free Software Foundation; either */
+/* version 2 of the License, or (at your option) any later */
+/* version. */
+/* This library is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* See the GNU Library General Public License for more details. */
+/* You should have received a copy of the GNU Library General */
+/* Public License along with this library; if not, write to the */
+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA */
+/* 02111-1307 USA */
+
+/* This library is free software under the Artistic license: */
+
/* REFERENCE */
/* M. Matsumoto and T. Nishimura, */
/* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform */
helpers/DATA/db4.7/007-mt19937db.c_license.patch deleted 100644 → 0
View file @ 119207ff
Description: mt19937db.c license should include the GPL
This file is distributed from upstream Berkeley DB under the Artistic
License (no version specified), althouth it was later released by the
original author under both GPL2+ and BSD.
.
References:
http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
.
Author: Ruben Rodriguez <ruben@trisquel.info>
--- a/crypto/mersenne/mt19937db.c
+++ b/crypto/mersenne/mt19937db.c
@@ -16,16 +16,27 @@
/* Coded by Takuji Nishimura, considering the suggestions by */
/* Topher Cooper and Marc Rieffel in July-Aug. 1997. */
-/* This library is free software under the Artistic license: */
-/* see the file COPYING distributed together with this code. */
-/* For the verification of the code, its output sequence file */
-/* mt19937int.out is attached (2001/4/2) */
-
/* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
/* Any feedback is very welcome. For any question, comments, */
/* see http://www.math.keio.ac.jp/matumoto/emt.html or email */
/* matumoto@math.keio.ac.jp */
+/* This library is free software; you can redistribute it and/or */
+/* modify it under the terms of the GNU Library General Public */
+/* License as published by the Free Software Foundation; either */
+/* version 2 of the License, or (at your option) any later */
+/* version. */
+/* This library is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* See the GNU Library General Public License for more details. */
+/* You should have received a copy of the GNU Library General */
+/* Public License along with this library; if not, write to the */
+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA */
+/* 02111-1307 USA */
+
+/* This library is free software under the Artistic license: */
+
/* REFERENCE */
/* M. Matsumoto and T. Nishimura, */
/* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform */
helpers/DATA/db4.8/007-mt19937db.c_license.patch deleted 100644 → 0
View file @ 119207ff
Description: mt19937db.c license should include the GPL
This file is distributed from upstream Berkeley DB under the Artistic
License (no version specified), althouth it was later released by the
original author under both GPL2+ and BSD.
.
References:
http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
.
Author: Ruben Rodriguez <ruben@trisquel.info>
--- a/crypto/mersenne/mt19937db.c
+++ b/crypto/mersenne/mt19937db.c
@@ -16,16 +16,27 @@
/* Coded by Takuji Nishimura, considering the suggestions by */
/* Topher Cooper and Marc Rieffel in July-Aug. 1997. */
-/* This library is free software under the Artistic license: */
-/* see the file COPYING distributed together with this code. */
-/* For the verification of the code, its output sequence file */
-/* mt19937int.out is attached (2001/4/2) */
-
/* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
/* Any feedback is very welcome. For any question, comments, */
/* see http://www.math.keio.ac.jp/matumoto/emt.html or email */
/* matumoto@math.keio.ac.jp */
+/* This library is free software; you can redistribute it and/or */
+/* modify it under the terms of the GNU Library General Public */
+/* License as published by the Free Software Foundation; either */
+/* version 2 of the License, or (at your option) any later */
+/* version. */
+/* This library is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* See the GNU Library General Public License for more details. */
+/* You should have received a copy of the GNU Library General */
+/* Public License along with this library; if not, write to the */
+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA */
+/* 02111-1307 USA */
+
+/* This library is free software under the Artistic license: */
+
/* REFERENCE */
/* M. Matsumoto and T. Nishimura, */
/* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform */
helpers/DATA/debian-installer/chmod_755_ld-linux2.patch 0 → 100644
View file @ 1be49b69
diff --git a/build/Makefile b/build/Makefile
index c073a32..cace03d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -431,6 +431,12 @@ endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifdef KERNELVERSION
+ifneq ($(DEB_HOST_ARCH),ppc64el)
+ find $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ -name "ld-linux*" | xargs -r chmod 755
+endif
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
+endif
# Set up modules.dep, ensure there is at least one standard dir (kernel
# in this case), so depmod will use its prune list for archs with no
# modules.
helpers/DATA/debian-installer/di_focal/1422_1421.diff 0 → 100644
View file @ 1be49b69
=== modified file 'build/Makefile'
--- build/Makefile 2010-11-05 16:34:29 +0000
+++ build/Makefile 2011-03-01 11:42:39 +0000
@@ -294,6 +294,7 @@
rm -rf $(TREE)
# Set up the basic files [u]dpkg needs.
mkdir -p $(DPKGDIR)/info
+ ln -nsf . $(DPKGDIR)/info/$(shell dpkg --print-architecture)
touch $(DPKGDIR)/status
# Create a tmp tree
mkdir -p $(TREE)/tmp
@@ -457,6 +458,7 @@
mkdir -p $(EXTRAUDEBSDIR)
mkdir -p $(EXTRAUDEBSDPKGDIR)/info $(EXTRAUDEBSDPKGDIR)/updates
+ ln -nsf . $(EXTRAUDEBSDPKGDIR)/info/$(shell dpkg --print-architecture)
touch $(EXTRAUDEBSDPKGDIR)/status $(EXTRAUDEBSDPKGDIR)/available
ifdef EXTRADRIVERS
#=== modified file 'debian/changelog'
#--- debian/changelog 2011-03-01 10:36:50 +0000
#+++ debian/changelog 2011-03-01 11:42:39 +0000
#@@ -1,3 +1,10 @@
#+debian-installer (20101020ubuntu21) UNRELEASED; urgency=low
#+
#+ * Install /var/lib/dpkg/info/$(dpkg --print-architecture) -> . symlink so
#+ that images build correctly in the presence of multiarch dpkg.
#+
#+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 01 Mar 2011 11:41:38 +0000
#+
# debian-installer (20101020ubuntu20) natty; urgency=low
#
# * Stop building the armel dove subarchitecture; it no longer has a kernel
#
helpers/DATA/debian-installer/di_focal/1677_1676.diff 0 → 100644
View file @ 1be49b69
=== modified file 'build/Makefile'
#--- build/Makefile 2011-12-15 15:35:38 +0000
#+++ build/Makefile 2012-04-18 05:24:59 +0000
#@@ -493,6 +493,12 @@
# `find $(TEMP) -type f -a \( -perm +0111 -o -name '*.so' -o -name '*.so.*' \) | \
# grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
#
#+ifeq ($(DEB_HOST_ARCH),armhf)
#+ # armhf has two linkers for now, while the world gets sorted
#+ mkdir -p $(TREE)/lib/arm-linux-gnueabihf
#+ ln -s /lib/ld-linux-armhf.so.3 $(TREE)/lib/arm-linux-gnueabihf/ld-linux.so.3
#+endif
#+
# ifeq ($(DEB_HOST_ARCH_OS),hurd)
# # On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
# # have the ld.so symlink as the interpreter. Ideally mklibs should
#
=== modified file 'build/config/armhf.cfg'
--- build/config/armhf.cfg 2012-04-11 08:52:18 +0000
+++ build/config/armhf.cfg 2012-04-18 05:24:59 +0000
@@ -1,5 +1,7 @@
SUBARCH_SUPPORTED = omap omap4 armadaxp
+MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
+
KERNELMAJOR = 2.6
KERNELVERSION = 3.2.0-23
KERNEL_FLAVOUR = di
#=== modified file 'debian/changelog'
#--- debian/changelog 2012-04-13 13:14:35 +0000
#+++ debian/changelog 2012-04-18 05:24:59 +0000
#@@ -1,3 +1,12 @@
#+debian-installer (20101020ubuntu134) precise; urgency=low
#+
#+ * Call mklibs with a hardcoded --ldlib in armhf.cfg, so we get a
#+ deterministic result in our linker search, and then add the
#+ symlink from the old linker path in build/Makefile (LP: #984007)
#+ * Rebuild with latest omap4 kernels for ext2 support (LP: #984180)
#+
#+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 17 Apr 2012 23:20:29 -0600
#+
# debian-installer (20101020ubuntu133) precise; urgency=low
#
# * Move armel/omap4 and armhf/omap4 to 3.2.0-1412.
#
helpers/DATA/debian-installer/di_focal/2057_2056.diff 0 → 100644
View file @ 1be49b69
=== modified file 'build/Makefile'
--- build/Makefile 2015-01-22 12:10:03 +0000
+++ build/Makefile 2015-03-17 21:09:21 +0000
@@ -414,6 +414,14 @@
# These files are used to build special kernel images for some
# subarchitectures. Move them out of the way.
+ #
+ # Merge note on the last if:
+ # On Debian, the first two if statements have the side-effect of
+ # moving the dtb files under $(TEMP)/lib. The device-tree
+ # media type expects this and will look for the dtbs there.
+ # Ubuntu installs dtbs into a different path (under
+ # /lib/firmware), so we need to simulate that side-effect
+ # here.
$(foreach VERSION,$(KERNELVERSION), \
if [ -d $(TREE)/usr/lib/kernel-image-$(VERSION) ]; then \
mv $(TREE)/usr/lib/kernel-image-$(VERSION) \
@@ -422,6 +430,10 @@
if [ -d $(TREE)/usr/lib/linux-image-$(VERSION) ]; then \
mv $(TREE)/usr/lib/linux-image-$(VERSION) \
$(TEMP)/lib; \
+ fi; \
+ if [ -d $(TREE)/lib/firmware/$(VERSION)/device-tree ]; then \
+ cp -a $(TREE)/lib/firmware/$(VERSION)/device-tree \
+ $(TEMP)/lib; \
fi;)
endif
endif
#@@ -763,6 +775,16 @@
# update-manifest $@ $(MANIFEST-KERNEL)
# endif
#
#+$(DTBS): $(TEMP_KERNEL)
#+ mkdir -p $(SOME_DEST)/$(EXTRANAME)
#+ set -ex ; for dtb in $$(find $(TEMP_DTBS) -name "*.dtb") ; do \
#+ tgt=$(SOME_DEST)/$(EXTRANAME)$$(basename $$dtb); \
#+ cp $$dtb $$tgt ; \
#+ update-manifest $$tgt "Device Tree Blob: $$(basename $$dtb)";\
#+ done
#+ cp boot/README.device-tree $@
#+ update-manifest $@ "Device Tree Blobs README"
#+
# # bootable images
# $(BOOT): $(TEMP_BOOT)
# install -m 644 -D $(TEMP_BOOT)$(GZIPPED) $@
#=== added file 'build/boot/README.device-tree'
#--- build/boot/README.device-tree 1970-01-01 00:00:00 +0000
#+++ build/boot/README.device-tree 2015-02-13 23:50:29 +0000
#@@ -0,0 +1,2 @@
#+This directory contains all of the device-tree files shipped by the Ubuntu
#+kernel package.
=== added directory 'build/boot/arm64'
=== added directory 'build/boot/arm64/grub'
=== added file 'build/boot/arm64/grub/grub-efi.cfg'
#--- build/boot/arm64/grub/grub-efi.cfg 1970-01-01 00:00:00 +0000
#+++ build/boot/arm64/grub/grub-efi.cfg 2015-02-24 04:58:57 +0000
#@@ -0,0 +1,3 @@
#+set menu_color_normal=cyan/blue
#+set menu_color_highlight=white/blue
#+
#=== modified file 'build/config/arm64.cfg'
#--- build/config/arm64.cfg 2015-05-09 07:52:07 +0000
#+++ build/config/arm64.cfg 2015-05-12 16:01:14 +0000
#@@ -1,14 +1,98 @@
#-SUBARCH_SUPPORTED = generic
#-
#-MKLIBS = mklibs-copy
#+MEDIUM_SUPPORTED = cdrom netboot device-tree
#
# KERNELMAJOR = 2.6
#-KERNELVERSION = 3.19.0-17
#+KERNELVERSION = 3.19.0-17-generic
# KERNEL_FLAVOUR = di
# KERNELIMAGEVERSION = $(KERNELVERSION)
#-KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
#+KERNELNAME = vmlinuz
#
#-VERSIONED_SYSTEM_MAP = t
#+GRUB_EFI=y
#+GRUB_PLATFORM=arm64-efi
#+GRUB_EFI_NAME=aa64
#+GRUB_FONT = /usr/share/grub/ascii.pf2
#
# arch_boot_screens:
# arch_tree:
#+
#+# Extract GRUB EFI files.
#+.PHONY: arm64_grub_efi
#+arm64_grub_efi:
#+ifeq ($(GRUB_EFI),y)
#+ efi-image $(TEMP_GRUB_EFI) arm64-efi aa64 $(NETBOOT_PATH)
#+endif
#+
#+
#+# Supply GRUB EFI configuration.
#+.PHONY: arch_cd_info_dir
#+arch_cd_info_dir: arm64_grub_efi
#+ -rm -f $(TEMP_CD_INFO_DIR)/*
#+ mkdir -p $(TEMP_CD_INFO_DIR)
#+
#+ if [ "$(GRUB_EFI)" = y ]; then \
#+ set -e; \
#+ mkdir -p $(TEMP_CD_INFO_DIR)/grub/arm64-efi; \
#+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_INFO_DIR)/grub/; \
#+ grub-gencfg \
#+ KERNEL /%install%/vmlinuz \
#+ INITRD /%install%/initrd.gz \
#+ HEADER boot/arm64/grub/grub-efi.cfg \
#+ > $(TEMP_CD_INFO_DIR)/grub/grub.cfg; \
#+ cp -a $(GRUB_FONT) $(TEMP_CD_INFO_DIR)/grub/font.pf2; \
#+ cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
#+ $(TEMP_CD_INFO_DIR)/grub/arm64-efi/; \
#+ fi
#+
#+.PHONY: arch_miniiso
#+arch_miniiso: arm64_grub_efi
#+ -rm -f $(TEMP_CD_TREE)/*
#+ mkdir -p $(TEMP_CD_TREE)
#+
#+ ln -f $(TEMP_KERNEL) $(TEMP_CD_TREE)/linux
#+ ln -f $(TEMP_INITRD) $(TEMP_CD_TREE)/initrd.gz
#+
#+ mkdir -p $(TEMP_CD_TREE)/.disk
#+ echo "$(DISTRIBUTION_NAME) $(DEBIAN_VERSION) $(ARCH) - netboot mini.iso $(BUILD_DATE)"\
#+ > $(TEMP_CD_TREE)/.disk/info
#+
#+ if [ "$(GRUB_EFI)" = y ]; then \
#+ set -e; \
#+ mkdir -p $(TEMP_CD_TREE)/boot/grub/arm64-efi; \
#+ cp -a $(TEMP_GRUB_EFI)/efi.img $(TEMP_CD_TREE)/boot/grub/; \
#+ grub-gencfg \
#+ KERNEL /linux \
#+ INITRD /initrd.gz \
#+ HEADER boot/arm64/grub/grub-efi.cfg \
#+ > $(TEMP_CD_TREE)/boot/grub/grub.cfg; \
#+ cp -a $(GRUB_FONT) $(TEMP_CD_TREE)/boot/grub/font.pf2; \
#+ cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
#+ $(TEMP_CD_TREE)/boot/grub/arm64-efi/; \
#+ fi
#+
#+ if [ "$(GRUB_EFI)" = y ]; then \
#+ xorriso -as mkisofs -r -J -c boot.cat \
#+ -boot-load-size 4 -boot-info-table \
#+ -eltorito-alt-boot \
#+ --efi-boot boot/grub/efi.img -no-emul-boot \
#+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
#+ fi
#+
#+.PHONY: arch_netboot_dir
#+arch_netboot_dir: arm64_grub_efi
#+ -rm -f $(TEMP_NETBOOT_DIR)
#+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
#+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
#+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
#+
#+ if [ "$(GRUB_EFI)" = y ]; then \
#+ set -e; \
#+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi; \
#+ cp -a $(TEMP_GRUB_EFI)/bootnetaa64.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
#+ cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
#+ cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
#+ $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi/; \
#+ grub-gencfg \
#+ KERNEL /$(NETBOOT_PATH)/linux \
#+ INITRD /$(NETBOOT_PATH)/initrd.gz \
#+ HEADER boot/arm64/grub/grub-efi.cfg \
#+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
#+ fi
=== added directory 'build/config/arm64/cdrom'
=== added file 'build/config/arm64/cdrom.cfg'
#--- build/config/arm64/cdrom.cfg 1970-01-01 00:00:00 +0000
#+++ build/config/arm64/cdrom.cfg 2015-02-24 05:14:26 +0000
#@@ -0,0 +1,3 @@
#+FLAVOUR_SUPPORTED = grub
#+
#+MEDIA_TYPE = CD-ROM
=== added file 'build/config/arm64/cdrom/grub.cfg'
#--- build/config/arm64/cdrom/grub.cfg 1970-01-01 00:00:00 +0000
#+++ build/config/arm64/cdrom/grub.cfg 2015-02-24 05:14:26 +0000
#@@ -0,0 +1,8 @@
#+MEDIA_TYPE = CD-ROM
#+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
#+
#+MANIFEST-KERNEL = "kernel for use with EFI to build a CD"
#+MANIFEST-INITRD = "initrd for use with EFI to build a CD"
#+MANIFEST-DEBIAN_CD_INFO = "EFI config files for CD"
#+
#+TYPE = cdrom/grub
#=== added file 'build/config/arm64/device-tree.cfg'
#--- build/config/arm64/device-tree.cfg 1970-01-01 00:00:00 +0000
#+++ build/config/arm64/device-tree.cfg 2015-02-13 23:51:06 +0000
#@@ -0,0 +1,4 @@
#+MEDIA_TYPE = device-tree blobs
#+
#+TARGET = $(DTBS)
#+EXTRANAME = $(MEDIUM)/
#=== removed file 'build/config/arm64/generic.cfg'
#--- build/config/arm64/generic.cfg 2014-01-27 14:09:42 +0000
#+++ build/config/arm64/generic.cfg 1970-01-01 00:00:00 +0000
#@@ -1,7 +0,0 @@
#-MEDIUM_SUPPORTED = netboot
#-
#-# The version of the kernel to use.
#-KERNELVERSION := $(KERNELVERSION)-generic
#-# we use non-versioned filenames in the generic kernel udeb
#-KERNELNAME = vmlinuz
#-VERSIONED_SYSTEM_MAP =
#=== removed file 'build/config/arm64/generic/netboot.cfg'
#--- build/config/arm64/generic/netboot.cfg 2015-02-27 10:58:49 +0000
#+++ build/config/arm64/generic/netboot.cfg 1970-01-01 00:00:00 +0000
#@@ -1,33 +0,0 @@
#-MEDIA_TYPE = netboot image
#-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) all-generic
#-EXTRANAME = $(MEDIUM)/
#-INITRD_FS = initramfs
#-
#-MANIFEST-INITRD = "netboot initrd"
#-MANIFEST-KERNEL = "kernel image to netboot"
#-
#-generic:
#- mkdir -p $(SOME_DEST)/$(EXTRANAME)/
#- cp $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/vmlinuz
#- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/initrd.gz
#- update-manifest $(SOME_DEST)/$(EXTRANAME)vmlinuz "Linux kernel for generic ARM64"
#- update-manifest $(SOME_DEST)/$(EXTRANAME)initrd.gz "initrd for generic ARM64"
#-
#-
#-xgene:
#- # Make sure our build environment is clean
#- $(eval INSTALL_PATH=$(SOME_DEST)/netboot/xgene)
#- rm -rf $(INSTALL_PATH)
#- mkdir -p $(INSTALL_PATH)
#-
#- # Generate uImage/uInitrd
#- mkimage -A arm -O linux -T kernel -C none -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(INSTALL_PATH)/uImage
#- mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(INSTALL_PATH)/uInitrd
#-
#- install -m644 $(TEMP)/tree/lib/firmware/${KERNELVERSION}/device-tree/apm/apm-mustang.dtb $(INSTALL_PATH)
#-
#- update-manifest $(INSTALL_PATH)/uImage "Linux kernel for X-Gene Boards"
#- update-manifest $(INSTALL_PATH)/uInitrd "initrd for X-Gene Boards"
#- update-manifest $(INSTALL_PATH)/apm-mustang.dtb "Device Tree file for APM X-Gene Mustang Board"
#-
#-all-generic: generic xgene
=== added file 'build/config/arm64/netboot.cfg'
#--- build/config/arm64/netboot.cfg 1970-01-01 00:00:00 +0000
#+++ build/config/arm64/netboot.cfg 2015-02-24 05:45:09 +0000
#@@ -0,0 +1,37 @@
#+MEDIA_TYPE = netboot image
#+
#+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
#+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
#+EXTRANAME = $(MEDIUM)/
#+
#+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
#+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
#+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
#+
#+.PHONY: arch_netboot_dir
#+arch_netboot_dir:
#+ -rm -f $(TEMP_NETBOOT_DIR)
#+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
#+ cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/linux
#+ cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/initrd.gz
#+
#+ if [ "$(GRUB_EFI)" = y ]; then \
#+ set -e; \
#+ mkdir -p $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi; \
#+ cp -a $(TEMP_GRUB_EFI)/bootnetaa64.efi $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH); \
#+ cp -a $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/font.pf2; \
#+ cp -a $(TEMP_GRUB_EFI)/boot/grub/arm64-efi/* \
#+ $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/arm64-efi/; \
#+ grub-gencfg \
#+ KERNEL /$(NETBOOT_PATH)/linux \
#+ INITRD /$(NETBOOT_PATH)/initrd.gz \
#+ HEADER boot/arm64/grub/grub-efi.cfg \
#+ > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub/grub.cfg; \
#+ fi
#+
#+ # Generate images for X-Gene systems using U-Boot.
#+ # They don't currently support bootz.
#+ $(eval XU_INSTALL_PATH=$(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/xgene-uboot)
#+ mkdir -p $(XU_INSTALL_PATH)
#+ mkimage -A arm -O linux -T kernel -C none -a 0x80000 -e 0x80000 -n "Ubuntu kernel" -d $(TEMP_KERNEL) $(XU_INSTALL_PATH)/uImage
#+ mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(XU_INSTALL_PATH)/uInitrd
#=== modified file 'build/config/dir'
#--- build/config/dir 2010-08-25 22:06:28 +0000
#+++ build/config/dir 2015-02-13 23:50:29 +0000
#@@ -62,6 +62,7 @@
# # The files we may want to have in dest/
# INITRD = $(SOME_DEST)/$(EXTRANAME)initrd.gz
# KERNEL = $(foreach name,$(KERNELNAME),$(SOME_DEST)/$(EXTRANAME)$(name))
#+DTBS = $(SOME_DEST)/$(EXTRANAME)README
# BOOT = $(SOME_DEST)/$(EXTRANAME)boot.img$(GZIPPED)
# ROOT = $(SOME_DEST)/$(EXTRANAME)root.img$(GZIPPED)
# EXTRA = $(SOME_DEST)/$(EXTRANAME).img$(GZIPPED)
#@@ -76,6 +77,7 @@
# TEMP_INITRD = $(TEMP)/initrd.gz
# TEMP_UDEB_LIST = $(TEMP)/udeb.list
# TEMP_KERNEL = $(foreach name,$(KERNELNAME),$(TEMP)/$(name))
#+TEMP_DTBS = $(TEMP)/lib
# TEMP_BOOT = $(TEMP)/boot.img
# TEMP_ROOT = $(TEMP)/root.img
# TEMP_MINIISO = $(TEMP)/mini.iso
#=== added file 'build/pkg-lists/cdrom/arm64.cfg'
#--- build/pkg-lists/cdrom/arm64.cfg 1970-01-01 00:00:00 +0000
#+++ build/pkg-lists/cdrom/arm64.cfg 2015-02-24 05:14:26 +0000
#@@ -0,0 +1,11 @@
#+fat-modules-${kernel:Version}
#+storage-core-modules-${kernel:Version}
#+input-modules-${kernel:Version}
#+console-setup-udeb
#+usb-modules-${kernel:Version} ?
#+#serial-modules-${kernel:Version}
#+usb-serial-modules-${kernel:Version} ?
#+uinput-modules-${kernel:Version} ?
#+
#+# also support MMC/SD cards
#+mmc-modules-${kernel:Version} ?
#=== added directory 'build/pkg-lists/cdrom/grub'
#=== added file 'build/pkg-lists/cdrom/grub/arm64.cfg'
#--- build/pkg-lists/cdrom/grub/arm64.cfg 1970-01-01 00:00:00 +0000
#+++ build/pkg-lists/cdrom/grub/arm64.cfg 2015-02-24 05:14:26 +0000
#@@ -0,0 +1,2 @@
#+# This image is based on the regular cdrom image, and gets all the packages
#+# from that one too.
#=== added file 'build/pkg-lists/cdrom/grub/common'
#--- build/pkg-lists/cdrom/grub/common 1970-01-01 00:00:00 +0000
#+++ build/pkg-lists/cdrom/grub/common 2015-03-17 21:09:21 +0000
#@@ -0,0 +1,3 @@
#+# This image is based on the regular cdrom image, and gets all the packages
#+# from that one too.
#+
=== added directory 'build/pkg-lists/device-tree'
#=== added file 'build/pkg-lists/device-tree/arm64.cfg'
#--- build/pkg-lists/device-tree/arm64.cfg 1970-01-01 00:00:00 +0000
#+++ build/pkg-lists/device-tree/arm64.cfg 2015-02-13 23:51:06 +0000
#@@ -0,0 +1,1 @@
#+# Empty
=== added file 'build/pkg-lists/device-tree/common'
#--- build/pkg-lists/device-tree/common 1970-01-01 00:00:00 +0000
#+++ build/pkg-lists/device-tree/common 2015-02-13 23:50:29 +0000
#@@ -0,0 +1,1 @@
#+#include "kernel"
#=== modified file 'build/util/efi-image'
#--- build/util/efi-image 2012-10-15 20:03:40 +0000
#+++ build/util/efi-image 2015-02-24 04:58:57 +0000
#@@ -22,13 +22,14 @@
# # it exists.
#
# if [ -z "$1" ] || [ -z "$2" ]; then
#- echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME"
#+ echo "usage: $0 OUTPUT-DIRECTORY GRUB-PLATFORM EFI-NAME [NETBOOT-PREFIX]"
# exit 1
# fi
#
# outdir="$1"
# platform="$2"
# efi_name="$3"
#+netboot_prefix="$4"
#
# memdisk_img=
# workdir=
#@@ -144,6 +145,11 @@
# search iso9660 configfile normal memdisk tar part_msdos fat
# fi
#
#+[ -z "$netboot_prefix" ] || \
#+grub-mkimage -O "$platform" \
#+ -o "$outdir/bootnet$efi_name.efi" -p "$netboot_prefix/grub" \
#+ search configfile normal efinet tftp net
#+
# # Stuff it into a FAT filesystem, making it as small as possible. 24KiB
# # headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
# size=$(( $(stat -c %s "$workdir/boot$efi_name.efi") / 1024 ))
#=== added file 'build/util/grub-gencfg'
#--- build/util/grub-gencfg 1970-01-01 00:00:00 +0000
#+++ build/util/grub-gencfg 2015-03-23 23:27:39 +0000
#@@ -0,0 +1,210 @@
#+#!/usr/bin/perl
#+
#+# Invoke as:
#+#
#+# ./gen-grub-cfg KEY1 VAL1 KEY2 VAL2 ... -- COMMAND LINE
#+#
#+# Keys are:
#+# KERNEL Normal kernel to use (required)
#+# INITRD Normal initrd to use (required)
#+# INITRD_GTK Graphical installer initrd (optional)
#+#
#+# KERNEL64 Alternative kernel for optional 64-bit entries
#+# INITRD64 Alternative initrd for optional 64-bit entries
#+# INITRD64_GTK Alternative graphical initrd for optional 64-bit entries
#+#
#+# THEME_PATH Path (in boot env) where themes are kept
#+# HEADER Local path to file cat include as a header
#+#
#+# At least KERNEL and INITRD must be given.
#+#
#+# Unsupported:
#+# DEBIAN_VERSION
#+# BUILD_DATE
#+#
#+# TODO: Theme generation from template
#+#
#+# When invoked as:
#+#
#+# ./gen-grub-cfg \
#+# KERNEL "/%install%/vmlinuz" \
#+# KERNEL64 "/%install-amd%/vmlinuz" \
#+# INITRD "/%install%/initrd.gz" \
#+# INITRD64 "/%install-amd%/initrd.gz" \
#+# INITRD_GTK "/%install%/gtk/initrd.gz" \
#+# INITRD64_GTK "/%install-amd%/gtk/initrd.gz" \
#+# THEME_PATH "/boot/grub/theme/" \
#+# HEADER "build/boot/x86/grub/grub-efi.cfg" \
#+# -- vga=788
#+#
#+# Will reproduce something similar to
#+# debian-testing-amd64-netinst.iso::/boot/grub/grub.cfg weekly build
#+# circa 2014-09-27.
#+
#+use warnings;
#+use strict;
#+
#+my %VARS;
#+
#+while (@ARGV) {
#+ my $key=shift;
#+ last if $key eq "--";
#+
#+ my $value=shift;
#+ $VARS{$key}=$value;
#+}
#+
#+my @OPTS = @ARGV;
#+
#+die "No kernel?" unless $VARS{KERNEL};
#+die "No initrd?" unless $VARS{INITRD};
#+
#+my $graphical = defined $VARS{INITRD_GTK};
#+my $sixtyfour = defined $VARS{KERNEL64} && defined $VARS{INITRD64}
#+ && (!$graphical || defined $VARS{INITRD64_GTK});
#+my $themed = defined $VARS{THEME_PATH};
#+
#+my @menu_number = (1);
#+
#+sub print_indented ($)
#+{
#+ my ($text) = @_;
#+ foreach ( split "\n", $text ) {
#+ my $i = 1;
#+ print " " while ( $i++ < $#menu_number );
#+ print "$_";
#+ print "\n";
#+ }
#+}
#+
#+sub menu_theme ()
#+{
#+ my $name = join "-", @menu_number;
#+}
#+sub print_set_theme ($)
#+{
#+ my ($theme) = @_;
#+ return unless $themed;
#+
#+ print_indented("set theme=$VARS{THEME_PATH}$theme\n");
#+}
#+
#+sub start_submenu ($)
#+{
#+ my ($title) = @_;
#+
#+ print_indented("submenu '$title' {\n");
#+
#+ my $theme = menu_theme();
#+ push @menu_number, 1;
#+
#+ print_indented("set menu_color_normal=cyan/blue\n");
#+ print_indented("set menu_color_highlight=white/blue\n");
#+ print_set_theme($theme);
#+}
#+sub end_submenu ()
#+{
#+ pop @menu_number;
#+ $menu_number[$#menu_number]++;
#+ print_indented("}\n");
#+}
#+
#+sub menuentry ($;%)
#+{
#+ my ($title,%xattr) = @_;
#+
#+ $xattr{SixtyFour} ||= 0;
#+ $xattr{Graphical} ||= 0;
#+
#+ $xattr{Expert} ||= 0;
#+ $xattr{Auto} ||= 0;
#+ $xattr{Rescue} ||= 0;
#+ $xattr{Speach} ||= 0;
#+
#+ $xattr{Quiet} = !$xattr{Expert} unless defined $xattr{Quiet};
#+
#+ return if $xattr{Graphical} && !$graphical;
#+ return if $xattr{SixtyFour} && !$sixtyfour;
#+
#+ die "automated expert?" if $xattr{Expert} && $xattr{Auto};
#+
#+ my $kernel = $xattr{SixtyFour} ? $VARS{KERNEL64} : $VARS{KERNEL};
#+ my $initrd = $xattr{Graphical} ? $VARS{INITRD_GTK} : $VARS{INITRD};
#+ $initrd = $xattr{Graphical} ? $VARS{INITRD64_GTK} : $VARS{INITRD64}
#+ if $xattr{SixtyFour};
#+
#+ die "no kernel" unless $kernel;
#+ die "no initrd" unless $initrd;
#+
#+ my @cmdline;
#+ # Ordering here is to allow diffing against previous versions of this file.
#+ push @cmdline, "desktop=$xattr{Desktop}" if $xattr{Desktop};
#+ push @cmdline, "priority=low" if $xattr{Expert};
#+ push @cmdline, ("auto=true", "priority=critical") if $xattr{Auto};
#+ push @cmdline, @OPTS;
#+ push @cmdline, "rescue/enable=true" if $xattr{Rescue};
#+ push @cmdline, "speakup.synth=soft" if $xattr{Speach};
#+ push @cmdline, "---";
#+ push @cmdline, "quiet" if $xattr{Quiet};
#+
#+ my $cmdline = join(" ", @cmdline);
#+
#+ print_indented (<<EOE);
#+menuentry '$title' {
#+ set background_color=black
#+ linux $kernel $cmdline
#+ initrd $initrd
#+}
#+EOE
#+}
#+
#+if ( defined $VARS{HEADER} )
#+{
#+ open(HEADER, "<$VARS{HEADER}") or die "open header: $!";
#+ print <HEADER> or die "write header: $!";
#+ close(HEADER) or die "close header: $!";
#+}
#+
#+print_set_theme(menu_theme());
#+push @menu_number, 1;
#+
#+menuentry("Install");
#+menuentry("Graphical install", Graphical => 1);
#+
#+start_submenu("Advanced options ..."); {
#+ menuentry("... Expert install", Expert => 1);
#+ menuentry("... Rescue mode", Rescue => 1);
#+ menuentry("... Automated install", Auto => 1);
#+ menuentry("... Graphical expert install", Graphical => 1, Expert => 1);
#+ menuentry("... Graphical rescue mode", Graphical => 1, Rescue => 1);
#+ menuentry("... Graphical automated install", Graphical => 1, Auto => 1);
#+
#+ start_submenu("... Desktop environment menu ..."); {
#+
#+ foreach ( ["GNOME", "gnome"], ["KDE", "kde"], ["LXDE", "lxde"] ) {
#+ my ($desktop,$opt) = @{$_};
#+
#+ my $one = sub { my ($title, %xargs) = @_;
#+ $xargs{Desktop} = $opt;
#+ menuentry($title, %xargs);
#+ };
#+ start_submenu("... $desktop desktop boot menu ..."); {
#+ $one->("... Install");
#+ $one->("... Graphical install", Graphical => 1);
#+
#+ start_submenu("... $desktop advanced options ..."); {
#+ $one->("... Expert install", Expert => 1);
#+ $one->("... Automated install", Auto => 1);
#+ $one->("... Graphical expert install", Graphical => 1, Expert => 1);
#+ $one->("... Graphical automated install", Graphical => 1, Auto => 1);
#+ } end_submenu(); # $desktop advanced
#+
#+ $one->("... Install with speech synthesis", Speach => 1);
#+ $one->("... Install with speech synthesis", Graphical => 1, Speach => 1);
#+ $one->("... 64 bit speech install", SixtyFour => 1, Graphical => 1, Speach => 1)
#+ if $sixtyfour;
#+ } end_submenu(); # $desktop submenu
#+ } # Desktop loop
#+ } end_submenu(); # Desktop submenu
#+} end_submenu(); # Advanced
#+menuentry('Install with speech synthesis', Graphical => $graphical, Speach => 1);
#=== modified file 'debian/changelog'
#--- debian/changelog 2015-05-09 07:52:07 +0000
#+++ debian/changelog 2015-05-14 14:24:09 +0000
#@@ -1,3 +1,25 @@
#+debian-installer (20101020ubuntu379) UNRELEASED; urgency=medium
#+
#+ [ dann frazier ]
#+ * arm64: Use mklibs instead of cargo-culting mklibs-copy. This
#+ currently reduces the initrd.gz by just under 1M and drops
#+ an unnecessary delta against Debian.
#+ * arm64: kernel and System.map aren't versioned, correct config.
#+ No functional change.
#+ * arm64: Stop calling "generic" a subarchitecture
#+ * arm64: Rename netboot/xgene -> netboot/xgene-uboot
#+ * Add device-tree medium infrastructure (from Debian)
#+ * arm64: Enable device-tree medium
#+ * arm64/xgene-uboot: apm-mustang.dtb is now in the device-tree directory,
#+ so we can drop it from the xgene-uboot directory.
#+ * arm64: Create a netboot tarball
#+ * arm64: Add netboot mini.iso
#+ * arm64: Build cdrom medium
#+ * arm64/netboot: Add a grub/efi build for netboot
#+ * grub-gencfg: Use --- as linux separator
#+
#+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 12 May 2015 15:45:32 -0400
#+
# debian-installer (20101020ubuntu378) wily; urgency=medium
#
# * Move master kernels to 3.19.0-17.
#=== modified file 'debian/control'
#--- debian/control 2014-10-30 08:19:25 +0000
#+++ debian/control 2015-04-03 21:16:40 +0000
#@@ -9,7 +9,7 @@
# Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
# Build-Conflicts: libnewt-pic [mipsel]
# # NOTE: Do not edit the next line by hand. See comment below.
#-Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-common [amd64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
#+Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], module-init-tools [i386 arm64 armeb armel armhf amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64el s390 sh4 sparc sparc64], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
# # This package has the worst Build-Depends in Debian, so it deserves some
# # explanation. Note that this comment can also be used to generate a
# # Build-Depends line, by running the debian/genbuilddeps program.
#@@ -82,7 +82,7 @@
# # default.)
# # - hfsutils [powerpc]
# # For making bootable HFS USB sticks for powerpc.
#-# - dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf]
#+# - dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64]
# # For creating FAT filesystems with mkfs.msdos.
# # Of course i386/amd64 use this for floppies, CDs etc.
# # ia64 uses it for floppies (?)
#@@ -151,7 +151,7 @@
# # - tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
# # For todos, used on files that need to be accessible from
# # DOS.
#-# - mtools [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]
#+# - mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf]
# # mcopy is used to put files onto FAT filesystems w/o
# # mounting them.
# # - po4a [i386 amd64]
#@@ -175,11 +175,11 @@
# # Used to create an UFS1 filesystem from a directory tree.
# # - grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386]
# # Used as the CD-ROM's bootloader
#-# - xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el]
#+# - xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el]
# # Used by grub-pc/grub-ieee1275-bin to create the CD-ROM images
#-# - grub-efi-amd64-bin (>= 2.00) [amd64]
#+# - grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64]
# # EFI bootloader support.
#-# - grub-common [amd64]
#+# - grub-common [amd64 arm64]
# # For the GRUB font.
# # - debian-ports-archive-keyring [sh4 sparc64]
# # Used for architectures hosted on debian-ports.org
helpers/DATA/debian-installer/di_focal/2144_2143.diff 0 → 100644
View file @ 1be49b69
=== modified file 'build/Makefile'
#--- build/Makefile 2015-12-09 17:32:28 +0000
#+++ build/Makefile 2016-04-16 19:45:21 +0000
#@@ -525,12 +525,6 @@
# `find $(TEMP) -type f -a \( -perm /0111 -o -name '*.so' -o -name '*.so.*' \) | \
# grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
#
#-ifeq ($(DEB_HOST_ARCH),armhf)
#- # armhf has two linkers for now, while the world gets sorted
#- mkdir -p $(TREE)/lib/arm-linux-gnueabihf
#- ln -s /lib/ld-linux-armhf.so.3 $(TREE)/lib/arm-linux-gnueabihf/ld-linux.so.3
#-endif
#-
# ifeq ($(DEB_HOST_ARCH_OS),hurd)
# # On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
# # have the ld.so symlink as the interpreter. Ideally mklibs should
#
#=== modified file 'build/config/amd64.cfg'
#--- build/config/amd64.cfg 2016-04-08 14:58:47 +0000
#+++ build/config/amd64.cfg 2016-04-16 19:45:21 +0000
#@@ -1,8 +1,6 @@
# MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-xen hd-media # netboot-gtk
# MEDIUM_SUPPORTED_EXTRA = monolithic
#
#-MKLIBS = mklibs-copy
#-
# # The version of the kernel to use.
# BASEVERSION = 4.4.0-18
# KERNELVERSION = $(BASEVERSION)-generic
#=== modified file 'build/config/amd64/netboot.cfg'
#--- build/config/amd64/netboot.cfg 2016-03-27 03:15:58 +0000
#+++ build/config/amd64/netboot.cfg 2016-04-16 19:45:21 +0000
#@@ -1,7 +1,7 @@
# MEDIA_TYPE = netboot image
#
# # Not really a floppy; this is for use on USB memory sticks.
#-FLOPPY_SIZE = 44032
#+FLOPPY_SIZE = 45056
# GZIPPED = .gz
# DISK_LABEL = "bootable drive"
=== modified file 'build/config/armhf.cfg'
--- build/config/armhf.cfg 2016-04-08 14:58:47 +0000
+++ build/config/armhf.cfg 2016-04-16 19:45:21 +0000
@@ -1,6 +1,6 @@
SUBARCH_SUPPORTED = generic-lpae generic
-MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
+MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
KERNELMAJOR = 2.6
KERNELVERSION = 4.4.0-18
#=== modified file 'build/config/common'
#--- build/config/common 2015-11-12 19:14:48 +0000
#+++ build/config/common 2016-04-16 19:45:21 +0000
#@@ -24,7 +24,7 @@
#
# # The library reducer to use. Set to mklibs (to build with library reduction)
# # or mklibs-copy (to build without library reduction).
#-MKLIBS = mklibs
#+MKLIBS = mklibs-copy
#
# # Normally the sources.list for building d-i will be derived from your
# # "normal" sources.list. However, you can specify a mirror here to override
#=== modified file 'build/config/i386/netboot.cfg'
#--- build/config/i386/netboot.cfg 2016-03-22 04:37:29 +0000
#+++ build/config/i386/netboot.cfg 2016-04-16 19:45:21 +0000
#@@ -3,7 +3,7 @@
# MEDIA_TYPE = netboot image
#
# # Not really a floppy; this is for use on USB memory sticks.
#-FLOPPY_SIZE = 40960
#+FLOPPY_SIZE = 41984
# GZIPPED = .gz
# DISK_LABEL = "bootable drive"
#=== modified file 'build/config/powerpc/powerpc/netboot.cfg'
#--- build/config/powerpc/powerpc/netboot.cfg 2016-03-22 05:15:29 +0000
#+++ build/config/powerpc/powerpc/netboot.cfg 2016-04-16 19:45:21 +0000
#@@ -1,7 +1,7 @@
# MEDIA_TYPE = netboot image
#
# # Not really a floppy; this is for use on USB memory sticks.
#-FLOPPY_SIZE = 49152
#+FLOPPY_SIZE = 50176
# GZIPPED = .gz
# DISK_LABEL = "bootable drive"
#=== modified file 'build/config/ppc64el.cfg'
#--- build/config/ppc64el.cfg 2016-04-08 14:58:47 +0000
#+++ build/config/ppc64el.cfg 2016-04-16 19:45:21 +0000
#@@ -1,7 +1,5 @@
# MEDIUM_SUPPORTED = netboot cdrom
#
#-MKLIBS = mklibs-copy
#-
# KERNELMAJOR = 2.6
# BASEVERSION = 4.4.0-18
# KERNELVERSION = $(BASEVERSION)-generic
#=== modified file 'build/pkg-lists/base'
#--- build/pkg-lists/base 2015-09-22 18:31:39 +0000
#+++ build/pkg-lists/base 2016-04-16 19:45:21 +0000
#@@ -10,7 +10,6 @@
# di-utils-shell
# libdebconfclient0-udeb
# libdebian-installer4-udeb
#-libnss-dns-udeb
# lowmemcheck
# lsb-release-udeb
# main-menu
#=== modified file 'build/pkg-lists/exclude'
#--- build/pkg-lists/exclude 2010-05-24 15:01:07 +0000
#+++ build/pkg-lists/exclude 2016-04-16 19:45:21 +0000
#@@ -2,15 +2,6 @@
# # they are currently provided not in udeb form but by the library
# # reduction step.
#
#-# libc gets reduced, so using the udeb is not a good idea
#-libc0.1 -
#-libc0.1-udeb -
#-libc0.3 -
#-libc0.3-udeb -
#-libc6 -
#-libc6-udeb -
#-libc6.1 -
#-libc6.1-udeb -
# # slang is also reduced
# libslang2-udeb -
# # and newt
#=== modified file 'build/pkg-lists/gtk-common'
#--- build/pkg-lists/gtk-common 2015-05-14 17:55:41 +0000
#+++ build/pkg-lists/gtk-common 2016-04-16 19:45:21 +0000
#@@ -1,5 +1,4 @@
# # udebs needed for graphical installer
#-libnss-files-udeb
# rootskel-gtk
# cdebconf-gtk-udeb
# cdebconf-gtk-terminal
#=== modified file 'build/pkg-lists/network-console'
#--- build/pkg-lists/network-console 2004-06-29 08:17:34 +0000
#+++ build/pkg-lists/network-console 2016-04-16 19:45:21 +0000
#@@ -1,4 +1,3 @@
# openssh-server-udeb
#-libnss-files-udeb
# network-console
#=== modified file 'debian/changelog'
#--- debian/changelog 2016-04-13 12:07:03 +0000
#+++ debian/changelog 2016-04-16 19:45:21 +0000
#@@ -1,3 +1,16 @@
#+debian-installer (20101020ubuntu448) xenial; urgency=medium
#+
#+ * Cherry-pick changes from Debian for the removal of libnss-*-udeb:
#+ - Switch to using mklibs-copy for the reduction on all arches.
#+ - Drop the build-dependency on glibc-pic, unneeded for above.
#+ - Stop excluding libc-udeb to avoid dropping libnss libraries
#+ and to avoid a useless download of libc-udeb during install.
#+ - Drop references to libnss-*-udeb, now provided by libc-udeb.
#+ - Drop extra armhf linker, libc-udeb provides the same symlink.
#+ * Bump FLOPPY_SIZE by 1MB on all arches to make room for the above.
#+
#+ -- Adam Conrad <adconrad@ubuntu.com> Sat, 16 Apr 2016 12:12:07 -0600
#+
# debian-installer (20101020ubuntu447) xenial; urgency=medium
#
# * Rebuild with updated udebs for s390x.
=== modified file 'debian/control'
#--- debian/control 2016-02-19 17:00:28 +0000
#+++ debian/control 2016-04-16 19:45:21 +0000
#@@ -9,7 +9,7 @@
# Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
# Build-Conflicts: libnewt-pic [mipsel]
# # NOTE: Do not edit the next line by hand. See comment below.
#-Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], kmod [linux-any], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
#+Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], kmod [linux-any], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
# # This package has the worst Build-Depends in Debian, so it deserves some
# # explanation. Note that this comment can also be used to generate a
# # Build-Depends line, by running the debian/genbuilddeps program.
#@@ -46,8 +46,6 @@
# # Provides system version information.
# #
# # Library build dependencies:
#-# - glibc-pic
#-# For library reduction.
# # - libslang2-pic (>= 2.0.6-4)
# # Make dependency versioned temporarily to make sure we avoid #392942
# # - libnewt-pic (>= 0.52.2-11.3) [!mipsel]
#@@ -73,7 +71,7 @@
# # them.
# # Lintian: Yes, we know it's essential. We prefer not to
# # count on it remaining so.
#-# - mklibs (>= 0.1.25)
#+# - mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40)
# # We use mklibs for library reduction.
# # - genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x]
# # For making mini isos.
##Ark74's fix
--- debian/control 2023-05-10 08:36:56.311243556 -0600
+++ debian/control 2023-05-10 12:00:07.617639516 -0600
@@ -45,6 +45,7 @@
# them.
# Lintian: Yes, we know it's essential. We prefer not to
# count on it remaining so.
+ mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40),
genisoimage [!s390 !s390x],
# For making mini isos.
genromfs [sparc sparc64],