| Message ID | 20230202150607.824537-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [isar-cip-core] conf/distro: Use cip prefix and snapshot postfix for sid lists | expand |
On 02.02.23 16:06, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This is done to avoid infecting other layers with the snapshot version. > > Reported-by: Felix Moessbauer <felix.moessbauer@siemens.com> > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > conf/distro/cip-core-sid-ports.conf | 1 + > .../{debian-sid.list => cip-debian-sid-ports-snapshot.list} | 0 > .../{debian-sid-ports.list => cip-debian-sid-snapshot.list} | 2 +- > 3 files changed, 2 insertions(+), 1 deletion(-) > rename conf/distro/{debian-sid.list => cip-debian-sid-ports-snapshot.list} (100%) > rename conf/distro/{debian-sid-ports.list => cip-debian-sid-snapshot.list} (81%) > > diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf > index 0b369bb..5f41bfb 100644 > --- a/conf/distro/cip-core-sid-ports.conf > +++ b/conf/distro/cip-core-sid-ports.conf > @@ -14,3 +14,4 @@ require cip-core-common.inc > > PREFERRED_VERSION_linux-cip ?= "5.10.%" > PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" Blank line here. > +DISTRO_APT_SOURCES = "conf/distro/cip-debian-${BASE_DISTRO_CODENAME}-ports-snapshot.list" > diff --git a/conf/distro/debian-sid.list b/conf/distro/cip-debian-sid-ports-snapshot.list > similarity index 100% > rename from conf/distro/debian-sid.list > rename to conf/distro/cip-debian-sid-ports-snapshot.list > diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/cip-debian-sid-snapshot.list > similarity index 81% > rename from conf/distro/debian-sid-ports.list > rename to conf/distro/cip-debian-sid-snapshot.list > index bf0f7a2..46d34d7 100644 > --- a/conf/distro/debian-sid-ports.list > +++ b/conf/distro/cip-debian-sid-snapshot.list > @@ -1,2 +1,2 @@ > -deb [check-valid-until=no] https://snapshot.debian.org/archive/debian-ports/20220925T001806Z sid main > +deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main Is that related or a separate fix - or even incorrect? > deb-src [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main Jan
On 2/2/23 20:52, Jan Kiszka wrote: > On 02.02.23 16:06, Quirin Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> This is done to avoid infecting other layers with the snapshot version. >> >> Reported-by: Felix Moessbauer <felix.moessbauer@siemens.com> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> conf/distro/cip-core-sid-ports.conf | 1 + >> .../{debian-sid.list => cip-debian-sid-ports-snapshot.list} | 0 >> .../{debian-sid-ports.list => cip-debian-sid-snapshot.list} | 2 +- >> 3 files changed, 2 insertions(+), 1 deletion(-) >> rename conf/distro/{debian-sid.list => cip-debian-sid-ports-snapshot.list} (100%) >> rename conf/distro/{debian-sid-ports.list => cip-debian-sid-snapshot.list} (81%) >> >> diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf >> index 0b369bb..5f41bfb 100644 >> --- a/conf/distro/cip-core-sid-ports.conf >> +++ b/conf/distro/cip-core-sid-ports.conf >> @@ -14,3 +14,4 @@ require cip-core-common.inc >> >> PREFERRED_VERSION_linux-cip ?= "5.10.%" >> PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" > > Blank line here. > >> +DISTRO_APT_SOURCES = "conf/distro/cip-debian-${BASE_DISTRO_CODENAME}-ports-snapshot.list" >> diff --git a/conf/distro/debian-sid.list b/conf/distro/cip-debian-sid-ports-snapshot.list >> similarity index 100% >> rename from conf/distro/debian-sid.list >> rename to conf/distro/cip-debian-sid-ports-snapshot.list >> diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/cip-debian-sid-snapshot.list >> similarity index 81% >> rename from conf/distro/debian-sid-ports.list >> rename to conf/distro/cip-debian-sid-snapshot.list >> index bf0f7a2..46d34d7 100644 >> --- a/conf/distro/debian-sid-ports.list >> +++ b/conf/distro/cip-debian-sid-snapshot.list >> @@ -1,2 +1,2 @@ >> -deb [check-valid-until=no] https://snapshot.debian.org/archive/debian-ports/20220925T001806Z sid main >> +deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main > > Is that related or a separate fix - or even incorrect? I look into it git has switched up the changes. Any idea to fix it as these two files have almost the same content and file name. Quirin > >> deb-src [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main > > Jan >
diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf index 0b369bb..5f41bfb 100644 --- a/conf/distro/cip-core-sid-ports.conf +++ b/conf/distro/cip-core-sid-ports.conf @@ -14,3 +14,4 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "5.10.%" PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" +DISTRO_APT_SOURCES = "conf/distro/cip-debian-${BASE_DISTRO_CODENAME}-ports-snapshot.list" diff --git a/conf/distro/debian-sid.list b/conf/distro/cip-debian-sid-ports-snapshot.list similarity index 100% rename from conf/distro/debian-sid.list rename to conf/distro/cip-debian-sid-ports-snapshot.list diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/cip-debian-sid-snapshot.list similarity index 81% rename from conf/distro/debian-sid-ports.list rename to conf/distro/cip-debian-sid-snapshot.list index bf0f7a2..46d34d7 100644 --- a/conf/distro/debian-sid-ports.list +++ b/conf/distro/cip-debian-sid-snapshot.list @@ -1,2 +1,2 @@ -deb [check-valid-until=no] https://snapshot.debian.org/archive/debian-ports/20220925T001806Z sid main +deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main deb-src [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main