diff mbox series

[meta-anaconda] anaconda_oe.py: correct image name

Message ID 20231018020602.379476-1-changqing.li@windriver.com
State New
Headers show
Series [meta-anaconda] anaconda_oe.py: correct image name | expand

Commit Message

Changqing Li Oct. 18, 2023, 2:06 a.m. UTC
From: Changqing Li <changqing.li@windriver.com>

Since oe-core commit 26d97acc713 [image-artifact-names: include
${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and
${IMAGE_LINK_NAME}], image name has changed to
core-image-minimal-qemux86.rootfs.ext4, change accordingly to fix error:
INSTALLER_TARGET_BUILD does not exist

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 README                                 | 2 +-
 lib/oeqa/selftest/cases/anaconda_oe.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Kai Oct. 20, 2023, 2:34 a.m. UTC | #1
On 10/18/23 10:06, Changqing Li wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> Since oe-core commit 26d97acc713 [image-artifact-names: include
> ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and
> ${IMAGE_LINK_NAME}], image name has changed to
> core-image-minimal-qemux86.rootfs.ext4, change accordingly to fix error:
> INSTALLER_TARGET_BUILD does not exist

Merged. Thanks.

Kai

>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>   README                                 | 2 +-
>   lib/oeqa/selftest/cases/anaconda_oe.py | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/README b/README
> index 07b63fe..76e9665 100644
> --- a/README
> +++ b/README
> @@ -162,7 +162,7 @@ Building the target installer
>              Edit conf/local.conf to use:
>              $ echo 'PACKAGE_CLASSES = "package_rpm"' >> conf/local.conf
>              $ echo 'DISTRO = "anaconda"' >> conf/local.conf
> -           $ echo 'INSTALLER_TARGET_BUILD = "<target_build>/tmp-glibc/deploy/images/qemux86/core-image-minimal-qemux86.ext4"' >> conf/local.conf
> +           $ echo 'INSTALLER_TARGET_BUILD = "<target_build>/tmp-glibc/deploy/images/qemux86/core-image-minimal-qemux86.rootfs.ext4"' >> conf/local.conf
>   
>              Edit conf/bblayers.conf to include other layers
>              BBLAYERS ?= " \
> diff --git a/lib/oeqa/selftest/cases/anaconda_oe.py b/lib/oeqa/selftest/cases/anaconda_oe.py
> index bf55308..20b8d5b 100644
> --- a/lib/oeqa/selftest/cases/anaconda_oe.py
> +++ b/lib/oeqa/selftest/cases/anaconda_oe.py
> @@ -146,7 +146,7 @@ class TestAnacondaOE(OESelftestTestCase):
>           ks_file = os.path.join(self.layer_path, 'example/ks-imagecopy.cfg')
>           features = 'TMPDIR .= "_host"\n'
>           features += 'DISTRO = "%s"\n' % self.anaconda_distro
> -        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
> +        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.rootfs.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
>           features += 'KICKSTART_FILE = "%s"\n' % ks_file
>           features += 'SYSLINUX_TIMEOUT = "10"\n'
>           features += 'APPEND:append = " textinst"\n'
> @@ -164,7 +164,7 @@ class TestAnacondaOE(OESelftestTestCase):
>       def test_testanaconda_imagecopy_install(self):
>           features = 'TMPDIR .= "_host"\n'
>           features += 'DISTRO = "%s"\n' % self.anaconda_distro
> -        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
> +        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.rootfs.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
>           self.logger.info('extra local.conf:\n%s' % features)
>           self.append_config(features)
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#61383): https://lists.yoctoproject.org/g/yocto/message/61383
> Mute This Topic: https://lists.yoctoproject.org/mt/102032096/3616933
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [kai.kang@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/README b/README
index 07b63fe..76e9665 100644
--- a/README
+++ b/README
@@ -162,7 +162,7 @@  Building the target installer
            Edit conf/local.conf to use:
            $ echo 'PACKAGE_CLASSES = "package_rpm"' >> conf/local.conf
            $ echo 'DISTRO = "anaconda"' >> conf/local.conf
-           $ echo 'INSTALLER_TARGET_BUILD = "<target_build>/tmp-glibc/deploy/images/qemux86/core-image-minimal-qemux86.ext4"' >> conf/local.conf
+           $ echo 'INSTALLER_TARGET_BUILD = "<target_build>/tmp-glibc/deploy/images/qemux86/core-image-minimal-qemux86.rootfs.ext4"' >> conf/local.conf
 
            Edit conf/bblayers.conf to include other layers
            BBLAYERS ?= " \
diff --git a/lib/oeqa/selftest/cases/anaconda_oe.py b/lib/oeqa/selftest/cases/anaconda_oe.py
index bf55308..20b8d5b 100644
--- a/lib/oeqa/selftest/cases/anaconda_oe.py
+++ b/lib/oeqa/selftest/cases/anaconda_oe.py
@@ -146,7 +146,7 @@  class TestAnacondaOE(OESelftestTestCase):
         ks_file = os.path.join(self.layer_path, 'example/ks-imagecopy.cfg')
         features = 'TMPDIR .= "_host"\n'
         features += 'DISTRO = "%s"\n' % self.anaconda_distro
-        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
+        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.rootfs.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
         features += 'KICKSTART_FILE = "%s"\n' % ks_file
         features += 'SYSLINUX_TIMEOUT = "10"\n'
         features += 'APPEND:append = " textinst"\n'
@@ -164,7 +164,7 @@  class TestAnacondaOE(OESelftestTestCase):
     def test_testanaconda_imagecopy_install(self):
         features = 'TMPDIR .= "_host"\n'
         features += 'DISTRO = "%s"\n' % self.anaconda_distro
-        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
+        features += 'INSTALLER_TARGET_BUILD = "%s/%s-%s.rootfs.ext4"\n' % (self.target_deploy_dir_image, self.target_recipe, self.machine)
         self.logger.info('extra local.conf:\n%s' % features)
         self.append_config(features)