Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build] Add the missing debian source bullseye-updates/buster-updates #12522

Merged
merged 2 commits into from
Oct 27, 2022

Conversation

xumia
Copy link
Collaborator

@xumia xumia commented Oct 27, 2022

Why I did it

Add the missing debian source bullseye-updates/buster-updates

The build failure as below, it is caused by the docker image debian:bullseye used the version 2.31-13+deb11u5, but the version only available in bullseye-update.

https://dev.azure.com/mssonic/build/_build/results?buildId=165930&view=logs&j=e2a1d004-6151-514d-dd3b-ba225f574bd9&t=f0777b63-8377-5b65-c700-6568122e76b9

The following packages have unmet dependencies:
 libc6-dev : Depends: libc6 (= 2.31-13+deb11u4) but 2.31-13+deb11u5 is to be installed
E: Unable to correct problems, you have held broken packages.
The command '/bin/sh -c apt-get update         &&     apt-get install -y                apt-utils                     build-essential               python3-dev' returned a non-zero code: 100
[  FAIL LOG END  ] [ target/docker-config-engine-bullseye.gz ]
make: *** [slave.mk:964: target/docker-config-engine-bullseye.gz] Error 1

Skip the stretch-update.

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@xumia xumia changed the title Add the missing debian source bullseye-updates/buster-updates [Build] Add the missing debian source bullseye-updates/buster-updates Oct 27, 2022
Copy link
Contributor

@kv-y kv-y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some files already contain required lines. You duplicate them.
BTW, should we also fix sonic-slave-bullseye/Dockerfile.j2 and sonic-slave-buster/Dockerfile.j2?

Comment on lines 5 to 7
deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
deb [arch=arm64] http://security.debian.org bullseye-security main contrib non-free
deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line duplication (bullseye-updates).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv-y , it is different mirror with the same name bullseye-update, it is not a duplicate. Could you please double check?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xumia,
line 5: deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
line 7: deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv-y , thanks a lot, fixed.

$ grep "updates main" dockers/ -r | uniq -cd        
      2 dockers/docker-base-bullseye/sources.list.arm64:deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
      2 dockers/docker-base-bullseye/sources.list.armhf:deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free

Comment on lines 5 to 7
deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
deb [arch=armhf] http://security.debian.org bullseye-security main contrib non-free
deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line duplication (bullseye-updates).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv-y , it is different mirror with the same name bullseye-update, it is not a duplicate. Could you please double check?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xumia
line 5: deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
line 7: deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv-y , fixed, thanks.

@kv-y
Copy link
Contributor

kv-y commented Oct 27, 2022

BTW, should we also fix sonic-slave-bullseye/Dockerfile.j2 and sonic-slave-buster/Dockerfile.j2?

By default sonic-slave docker images for amd64 have this mirror in /etc/apt/sources.list:
deb http://deb.debian.org/debian bullseye-updates main

And you append (but not overwrite) new mirrors (trafficmanager.net) in sonic-slave-xxx/Dockerfile.j2.
That's why build of sonic-slave-bullseye was not failed.
But my suggestion is also add for unification:
echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \

Also same question about bullseye-updates mirrors in files/apt/sources.list.xxx

@xumia
Copy link
Collaborator Author

xumia commented Oct 27, 2022

BTW, should we also fix sonic-slave-bullseye/Dockerfile.j2 and sonic-slave-buster/Dockerfile.j2?

By default sonic-slave docker images for amd64 have this mirror in /etc/apt/sources.list: deb http://deb.debian.org/debian bullseye-updates main
And you append (but not overwrite) new mirrors (trafficmanager.net) in sonic-slave-xxx/Dockerfile.j2. That's why build of sonic-slave-bullseye was not failed. But my suggestion is also add for unification: echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \ echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
Also same question about bullseye-updates mirrors in files/apt/sources.list.xxx

I have created an issue to fix it #12523. We can create a mirror template for all debian config, for different distributions, architectures, slaves or base images.

@yxieca yxieca merged commit a771a26 into sonic-net:master Oct 27, 2022
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Oct 31, 2022
…sonic-net#12522)

Why I did it
Add the missing debian source bullseye-updates/buster-updates

The build failure as below, it is caused by the docker image debian:bullseye used the version 2.31-13+deb11u5, but the version only available in bullseye-update.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #12555

xumia added a commit that referenced this pull request Oct 31, 2022
…#12522)

Why I did it
Add the missing debian source bullseye-updates/buster-updates

The build failure as below, it is caused by the docker image debian:bullseye used the version 2.31-13+deb11u5, but the version only available in bullseye-update.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants