| Message ID | 20231010075014.3761016-2-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] wic: Rename wic/simatic-ipc227e.wks to wic/x86_64-generic.wks | expand |
On 10.10.23 09:50, Nobuhiro Iwamatsu wrote: > wic/simatic-ipc227e.wks has been changed to wic/x86_64-generic.wks. This > is set in the WKS_FILE variable. > This file format is different from conf/distro/cip-core-common.inc, so we need > to set WKS_FILE as x86_64-generic.wks in simatic-ipc227e.conf. > Add WKS_FILE to simatic-ipc227e.conf. > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> > --- > conf/machine/simatic-ipc227e.conf | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf > index a624fcd..8bb3e80 100644 > --- a/conf/machine/simatic-ipc227e.conf > +++ b/conf/machine/simatic-ipc227e.conf > @@ -9,6 +9,7 @@ > DISTRO_ARCH = "amd64" > > IMAGE_FSTYPES ?= "wic" > +WKS_FILE ?= "x86_64-generic.wks" > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > USE_CIP_KERNEL_CONFIG = "1" > KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" Patch 1 and 2 need to be merged, or we have a build breakage after patch 1, don't we? Jan
Hi! > -----Original Message----- > From: Jan Kiszka <jan.kiszka@siemens.com> > Sent: Tuesday, October 10, 2023 4:53 PM > To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ) > <nobuhiro1.iwamatsu@toshiba.co.jp> > Cc: cip-dev@lists.cip-project.org > Subject: Re: [PATCH 2/2] simatic-ipc227e: conf: Add WKS_FILE as > x86_64-generic.wks > > On 10.10.23 09:50, Nobuhiro Iwamatsu wrote: > > wic/simatic-ipc227e.wks has been changed to wic/x86_64-generic.wks. > > This is set in the WKS_FILE variable. > > This file format is different from conf/distro/cip-core-common.inc, so > > we need to set WKS_FILE as x86_64-generic.wks in simatic-ipc227e.conf. > > Add WKS_FILE to simatic-ipc227e.conf. > > > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> > > --- > > conf/machine/simatic-ipc227e.conf | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/conf/machine/simatic-ipc227e.conf > > b/conf/machine/simatic-ipc227e.conf > > index a624fcd..8bb3e80 100644 > > --- a/conf/machine/simatic-ipc227e.conf > > +++ b/conf/machine/simatic-ipc227e.conf > > @@ -9,6 +9,7 @@ > > DISTRO_ARCH = "amd64" > > > > IMAGE_FSTYPES ?= "wic" > > +WKS_FILE ?= "x86_64-generic.wks" > > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > > USE_CIP_KERNEL_CONFIG = "1" > > KERNEL_DEFCONFIG = > "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227 > e_defconfig" > > Patch 1 and 2 need to be merged, or we have a build breakage after patch 1, > don't we? Correct. I will merge this series and re-send. Best regards, Nobuhiro
diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index a624fcd..8bb3e80 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -9,6 +9,7 @@ DISTRO_ARCH = "amd64" IMAGE_FSTYPES ?= "wic" +WKS_FILE ?= "x86_64-generic.wks" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig"
wic/simatic-ipc227e.wks has been changed to wic/x86_64-generic.wks. This is set in the WKS_FILE variable. This file format is different from conf/distro/cip-core-common.inc, so we need to set WKS_FILE as x86_64-generic.wks in simatic-ipc227e.conf. Add WKS_FILE to simatic-ipc227e.conf. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> --- conf/machine/simatic-ipc227e.conf | 1 + 1 file changed, 1 insertion(+)