| Message ID | 162be0421d8f27072b2476f95c6d2df9aa09b5f6.1598865682.git.jan.kiszka@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | None | expand |
Hi, > -----Original Message----- > From: cip-dev@lists.cip-project.org [mailto:cip-dev@lists.cip-project.org] On Behalf Of Jan Kiszka > Sent: Monday, August 31, 2020 6:21 PM > To: cip-dev@lists.cip-project.org > Cc: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp> > Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 > > From: Jan Kiszka <jan.kiszka@siemens.com> > > The switch is needed as kernel.org snapshot tend to fail too often. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > recipes-kernel/linux/linux-cip-common.inc | 4 +++- > recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- > recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- > recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- > ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- > recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) > rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%) > > diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc > index 0c76835..7e09090 100644 > --- a/recipes-kernel/linux/linux-cip-common.inc > +++ b/recipes-kernel/linux/linux-cip-common.inc > @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): > require recipes-kernel/linux/linux-custom.inc > > SRC_URI += " \ > - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ > + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \ I thought it would be good to use a URL as a variable and overwrite it. Is it difficult because the hash of the file changes depending on the mirror? > " > > SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \ > > "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=c > ip-kernel-config", \ > "file://${KERNEL_DEFCONFIG}",d)}" > SRCREV_cip-kernel-config ?= "ca24d965adf77730caf1cd32bdfcffd69e369502" > + > +S = "${WORKDIR}/linux-cip-v${PV}" > diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc > index d182358..dffb77b 100644 > --- a/recipes-kernel/linux/linux-cip-rt-common.inc > +++ b/recipes-kernel/linux/linux-cip-rt-common.inc > @@ -13,8 +13,6 @@ require linux-cip-common.inc > > SRC_URI += "file://preempt-rt.cfg" > > -S = "${WORKDIR}/linux-cip-${PV}" > - > do_prepare_build_prepend() { > cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG} > } > diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb > b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb > index 7414f23..820c1ab 100644 > --- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb > +++ b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb > @@ -11,4 +11,4 @@ > > require linux-cip-rt-common.inc > > -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db" > +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743" > diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb > b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb > index 8881071..e13fc14 100644 > --- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb > +++ b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb > @@ -11,4 +11,4 @@ > > require linux-cip-rt-common.inc > > -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5" > +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e" > diff --git a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb > similarity index 67% > rename from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb > rename to recipes-kernel/linux/linux-cip_4.19.140-cip33.bb > index 59afd8e..9e958c0 100644 > --- a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb > +++ b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb > @@ -11,4 +11,4 @@ > > require linux-cip-common.inc > > -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6" > +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5" > diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb > index 2303d49..af49441 100644 > --- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb > +++ b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb > @@ -11,4 +11,4 @@ > > require linux-cip-common.inc > > -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531" > +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf" > -- > 2.26.2 Best regards, Nobuhiro -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5344): https://lists.cip-project.org/g/cip-dev/message/5344 Mute This Topic: https://lists.cip-project.org/mt/76530564/4520428 Group Owner: cip-dev+owner@lists.cip-project.org Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy [patchwork-cip-dev@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
On 01.09.20 01:03, Nobuhiro Iwamatsu wrote: > Hi, > >> -----Original Message----- >> From: cip-dev@lists.cip-project.org [mailto:cip-dev@lists.cip-project.org] On Behalf Of Jan Kiszka >> Sent: Monday, August 31, 2020 6:21 PM >> To: cip-dev@lists.cip-project.org >> Cc: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp> >> Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 >> >> From: Jan Kiszka <jan.kiszka@siemens.com> >> >> The switch is needed as kernel.org snapshot tend to fail too often. >> >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> >> --- >> recipes-kernel/linux/linux-cip-common.inc | 4 +++- >> recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- >> recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- >> recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- >> ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- >> recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- >> 6 files changed, 7 insertions(+), 7 deletions(-) >> rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%) >> >> diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc >> index 0c76835..7e09090 100644 >> --- a/recipes-kernel/linux/linux-cip-common.inc >> +++ b/recipes-kernel/linux/linux-cip-common.inc >> @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): >> require recipes-kernel/linux/linux-custom.inc >> >> SRC_URI += " \ >> - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ >> + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \ > > I thought it would be good to use a URL as a variable and overwrite it. > Is it difficult because the hash of the file changes depending on the mirror? Yes, unfortunately. gitlab packages differently (under a different directory) than korg. That prevents simply providing one as a fallback mirror of the other, at least when pulling tarballs rather than full git trees. Jan
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc index 0c76835..7e09090 100644 --- a/recipes-kernel/linux/linux-cip-common.inc +++ b/recipes-kernel/linux/linux-cip-common.inc @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \ " SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=cip-kernel-config", \ "file://${KERNEL_DEFCONFIG}",d)}" SRCREV_cip-kernel-config ?= "ca24d965adf77730caf1cd32bdfcffd69e369502" + +S = "${WORKDIR}/linux-cip-v${PV}" diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc index d182358..dffb77b 100644 --- a/recipes-kernel/linux/linux-cip-rt-common.inc +++ b/recipes-kernel/linux/linux-cip-rt-common.inc @@ -13,8 +13,6 @@ require linux-cip-common.inc SRC_URI += "file://preempt-rt.cfg" -S = "${WORKDIR}/linux-cip-${PV}" - do_prepare_build_prepend() { cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG} } diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb index 7414f23..820c1ab 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db" +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743" diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb index 8881071..e13fc14 100644 --- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb +++ b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb @@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5" +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e" diff --git a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb similarity index 67% rename from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb rename to recipes-kernel/linux/linux-cip_4.19.140-cip33.bb index 59afd8e..9e958c0 100644 --- a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb +++ b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6" +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5" diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb index 2303d49..af49441 100644 --- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb +++ b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb @@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531" +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"