| Message ID | 20230517102256.1511870-1-srinuvasan_a@mentor.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [isar-cip-core] kas/opt/6.1-mainline: use KERNEL_DEFCONFIG from cip-kernel-config | expand |
On 17.05.23 12:22, Srinuvasan Arjunan wrote: > From: Srinuvasan A <srinuvasan.a@siemens.com> > > Presently 6.1 mainline kernel uses it's internal configuration, now cip > provides the defconfig for 6.1 LTS, hence use that one, this config > already conatins the CONFIG_SQUASHFS, so remove this one from recipe. > > Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com> > --- > kas/opt/6.1-mainline.yml | 1 - > recipes-kernel/linux/files/squashfs.cfg | 1 - > recipes-kernel/linux/linux-mainline_6.1.15.bb | 3 +-- > 3 files changed, 1 insertion(+), 4 deletions(-) > delete mode 100644 recipes-kernel/linux/files/squashfs.cfg > > diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1-mainline.yml > index 84d12b0..0dcf336 100644 > --- a/kas/opt/6.1-mainline.yml > +++ b/kas/opt/6.1-mainline.yml > @@ -14,5 +14,4 @@ header: > > local_conf_header: > kernel-version: | > - KERNEL_DEFCONFIG = "" That was actually missing from my patch to finally use the cip-kernel-config - good point. > KERNEL_NAME = "mainline" > diff --git a/recipes-kernel/linux/files/squashfs.cfg b/recipes-kernel/linux/files/squashfs.cfg > deleted file mode 100644 > index 7a89d00..0000000 > --- a/recipes-kernel/linux/files/squashfs.cfg > +++ /dev/null > @@ -1 +0,0 @@ > -CONFIG_SQUASHFS=y > diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb > index 690f6dd..9b45f28 100644 > --- a/recipes-kernel/linux/linux-mainline_6.1.15.bb > +++ b/recipes-kernel/linux/linux-mainline_6.1.15.bb > @@ -12,8 +12,7 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else > KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" > > SRC_URI += " \ > - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \ > - file://squashfs.cfg" > + https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz" > > SRC_URI[sha256sum] = "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd" > If you don't mind, I'll fold that into [1] and send it as v2. Jan [1] https://lore.kernel.org/cip-dev/f1be8d8c-d58d-715f-b6c0-39d76826450e@siemens.com/T/#u
On Wed, May 17, 2023 at 03:57 PM, Jan Kiszka wrote: > > On 17.05.23 12:22, Srinuvasan Arjunan wrote: > >> From: Srinuvasan A <srinuvasan.a@siemens.com> >> >> Presently 6.1 mainline kernel uses it's internal configuration, now cip >> provides the defconfig for 6.1 LTS, hence use that one, this config >> already conatins the CONFIG_SQUASHFS, so remove this one from recipe. >> >> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com> >> --- >> kas/opt/6.1-mainline.yml | 1 - >> recipes-kernel/linux/files/squashfs.cfg | 1 - >> recipes-kernel/linux/linux-mainline_6.1.15.bb | 3 +-- >> 3 files changed, 1 insertion(+), 4 deletions(-) >> delete mode 100644 recipes-kernel/linux/files/squashfs.cfg >> >> diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1-mainline.yml >> index 84d12b0..0dcf336 100644 >> --- a/kas/opt/6.1-mainline.yml >> +++ b/kas/opt/6.1-mainline.yml >> @@ -14,5 +14,4 @@ header: >> >> local_conf_header: >> kernel-version: | >> - KERNEL_DEFCONFIG = "" > > That was actually missing from my patch to finally use the > cip-kernel-config - good point. > > >> KERNEL_NAME = "mainline" >> diff --git a/recipes-kernel/linux/files/squashfs.cfg >> b/recipes-kernel/linux/files/squashfs.cfg >> deleted file mode 100644 >> index 7a89d00..0000000 >> --- a/recipes-kernel/linux/files/squashfs.cfg >> +++ /dev/null >> @@ -1 +0,0 @@ >> -CONFIG_SQUASHFS=y >> diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb >> b/recipes-kernel/linux/linux-mainline_6.1.15.bb >> index 690f6dd..9b45f28 100644 >> --- a/recipes-kernel/linux/linux-mainline_6.1.15.bb >> +++ b/recipes-kernel/linux/linux-mainline_6.1.15.bb >> @@ -12,8 +12,7 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if >> d.getVar('PV').endswith('.0') else >> KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" >> >> SRC_URI += " \ >> - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux- ${ARCHIVE_VERSION}.tar.xz >> \ >> - file://squashfs.cfg" >> + https://cdn.kernel.org/pub/linux/kernel/v6.x/linux- ${ARCHIVE_VERSION}.tar.xz" >> >> >> SRC_URI[sha256sum] = >> "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd" > > If you don't mind, I'll fold that into [1] and send it as v2. Sure jan, Please send v2. > > > Jan > > [1] > https://lore.kernel.org/cip-dev/f1be8d8c-d58d-715f-b6c0-39d76826450e@siemens.com/T/#u > > > -- > Siemens AG, Technology > Competence Center Embedded Linux
diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1-mainline.yml index 84d12b0..0dcf336 100644 --- a/kas/opt/6.1-mainline.yml +++ b/kas/opt/6.1-mainline.yml @@ -14,5 +14,4 @@ header: local_conf_header: kernel-version: | - KERNEL_DEFCONFIG = "" KERNEL_NAME = "mainline" diff --git a/recipes-kernel/linux/files/squashfs.cfg b/recipes-kernel/linux/files/squashfs.cfg deleted file mode 100644 index 7a89d00..0000000 --- a/recipes-kernel/linux/files/squashfs.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SQUASHFS=y diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb index 690f6dd..9b45f28 100644 --- a/recipes-kernel/linux/linux-mainline_6.1.15.bb +++ b/recipes-kernel/linux/linux-mainline_6.1.15.bb @@ -12,8 +12,7 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" SRC_URI += " \ - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \ - file://squashfs.cfg" + https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz" SRC_URI[sha256sum] = "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd"