| Message ID | 20230206082541.15361-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [isar-cip-core,v4] conf/distro: Use cip prefix and snapshot postfix for sid lists | expand |
On 06.02.23 09:25, 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> > --- > Changes v4: > - Restore and rename debian-sid.list to cip-debian-sid-snapshot > - use squash to avoid wrong file assignment in patch after renaming > - Replace Variables in *DISTRO_APT_SOURCES with names > > Changes v3: > - delete debian-sid.list as it is not used. > - add missing newline > > Changes v2: > - split renameing into two patches to avoid wrong patch > - add missing newline > > conf/distro/cip-core-sid-ports.conf | 3 +++ > ...ebian-sid-ports.list => cip-debian-sid-ports-snapshot.list} | 0 > conf/distro/{debian-sid.list => cip-debian-sid-snapshot.list} | 0 > 3 files changed, 3 insertions(+) > rename conf/distro/{debian-sid-ports.list => cip-debian-sid-ports-snapshot.list} (100%) > rename conf/distro/{debian-sid.list => cip-debian-sid-snapshot.list} (100%) > > diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf > index 0b369bb..c5d1cc7 100644 > --- a/conf/distro/cip-core-sid-ports.conf > +++ b/conf/distro/cip-core-sid-ports.conf > @@ -14,3 +14,6 @@ require cip-core-common.inc > > PREFERRED_VERSION_linux-cip ?= "5.10.%" > PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" > + > +HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list" > +DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-ports-snapshot.list" > diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/cip-debian-sid-ports-snapshot.list > similarity index 100% > rename from conf/distro/debian-sid-ports.list > rename to conf/distro/cip-debian-sid-ports-snapshot.list > diff --git a/conf/distro/debian-sid.list b/conf/distro/cip-debian-sid-snapshot.list > similarity index 100% > rename from conf/distro/debian-sid.list > rename to conf/distro/cip-debian-sid-snapshot.list Thanks, applied. Jan
On 07.02.23 14:36, Jan Kiszka wrote: > On 06.02.23 09:25, 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> >> --- >> Changes v4: >> - Restore and rename debian-sid.list to cip-debian-sid-snapshot >> - use squash to avoid wrong file assignment in patch after renaming >> - Replace Variables in *DISTRO_APT_SOURCES with names >> >> Changes v3: >> - delete debian-sid.list as it is not used. >> - add missing newline >> >> Changes v2: >> - split renameing into two patches to avoid wrong patch >> - add missing newline >> >> conf/distro/cip-core-sid-ports.conf | 3 +++ >> ...ebian-sid-ports.list => cip-debian-sid-ports-snapshot.list} | 0 >> conf/distro/{debian-sid.list => cip-debian-sid-snapshot.list} | 0 >> 3 files changed, 3 insertions(+) >> rename conf/distro/{debian-sid-ports.list => cip-debian-sid-ports-snapshot.list} (100%) >> rename conf/distro/{debian-sid.list => cip-debian-sid-snapshot.list} (100%) >> >> diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf >> index 0b369bb..c5d1cc7 100644 >> --- a/conf/distro/cip-core-sid-ports.conf >> +++ b/conf/distro/cip-core-sid-ports.conf >> @@ -14,3 +14,6 @@ require cip-core-common.inc >> >> PREFERRED_VERSION_linux-cip ?= "5.10.%" >> PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" >> + >> +HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list" This is incomplete, needs both host and target apt sources. Fixes up in next. Jan
diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf index 0b369bb..c5d1cc7 100644 --- a/conf/distro/cip-core-sid-ports.conf +++ b/conf/distro/cip-core-sid-ports.conf @@ -14,3 +14,6 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "5.10.%" PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" + +HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list" +DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-ports-snapshot.list" diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/cip-debian-sid-ports-snapshot.list similarity index 100% rename from conf/distro/debian-sid-ports.list rename to conf/distro/cip-debian-sid-ports-snapshot.list diff --git a/conf/distro/debian-sid.list b/conf/distro/cip-debian-sid-snapshot.list similarity index 100% rename from conf/distro/debian-sid.list rename to conf/distro/cip-debian-sid-snapshot.list