From patchwork Mon Dec 6 15:35:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 684 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97C39C4332F for ; Mon, 6 Dec 2021 15:35:37 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web11.53117.1638804936355119600 for ; Mon, 06 Dec 2021 07:35:36 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: from localhost.localdomain (84-115-236-2.cable.dynamic.surfer.at [84.115.236.2]) (Authenticated sender: foss@0leil.net) by relay10.mail.gandi.net (Postfix) with ESMTPA id 9AA37240017; Mon, 6 Dec 2021 15:35:34 +0000 (UTC) From: Quentin Schulz To: openembedded-core@lists.openembedded.org Cc: Quentin Schulz Subject: [PATCH 1/4] rename core-image-testmaster* to core-image-testgolden Date: Mon, 6 Dec 2021 16:35:08 +0100 Message-Id: <20211206153511.34838-2-foss+yocto@0leil.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206153511.34838-1-foss+yocto@0leil.net> References: <20211206153511.34838-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Dec 2021 15:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159243 "golden" has a more explicit meaning than master in addition to not being an issue wrt inclusivity. Signed-off-by: Quentin Schulz --- meta/conf/distro/include/distro_alias.inc | 4 ++-- meta/conf/distro/include/maintainers.inc | 4 ++-- meta/lib/oeqa/controllers/masterimage.py | 6 +++--- ...ster-initramfs.bb => core-image-testgolden-initramfs.bb} | 2 +- .../{core-image-testmaster.bb => core-image-testgolden.bb} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename meta/recipes-extended/images/{core-image-testmaster-initramfs.bb => core-image-testgolden-initramfs.bb} (92%) rename meta/recipes-extended/images/{core-image-testmaster.bb => core-image-testgolden.bb} (80%) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 44bc3bf1315..2649a21474b 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -42,8 +42,8 @@ DISTRO_PN_ALIAS:pn-core-image-rt-sdk = "OE-Core" DISTRO_PN_ALIAS:pn-core-image-sato = "OE-Core" DISTRO_PN_ALIAS:pn-core-image-sato-dev = "OE-Core" DISTRO_PN_ALIAS:pn-core-image-sato-sdk = "OE-Core" -DISTRO_PN_ALIAS:pn-core-image-testmaster = "OE-Core" -DISTRO_PN_ALIAS:pn-core-image-testmaster-initramfs = "OE-Core" +DISTRO_PN_ALIAS:pn-core-image-testgolden = "OE-Core" +DISTRO_PN_ALIAS:pn-core-image-testgolden-initramfs = "OE-Core" DISTRO_PN_ALIAS:pn-core-image-weston = "OE-Core" DISTRO_PN_ALIAS:pn-core-image-x11 = "OE-Core" DISTRO_PN_ALIAS:pn-createrepo-c = "Fedora=createrepo_c Clear=createrepo_c" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 97ba2ce79c8..61572247560 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -112,8 +112,8 @@ RECIPE_MAINTAINER:pn-core-image-ptest-all = "Richard Purdie X-Patchwork-Id: 683 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99A0DC43217 for ; Mon, 6 Dec 2021 15:35:38 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web10.53185.1638804937073418541 for ; Mon, 06 Dec 2021 07:35:37 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: from localhost.localdomain (84-115-236-2.cable.dynamic.surfer.at [84.115.236.2]) (Authenticated sender: foss@0leil.net) by relay10.mail.gandi.net (Postfix) with ESMTPA id 53867240005; Mon, 6 Dec 2021 15:35:35 +0000 (UTC) From: Quentin Schulz To: openembedded-core@lists.openembedded.org Cc: Quentin Schulz Subject: [PATCH 2/4] core: initrdscripts: init-install{-efi,}-testfs.sh: rename masterimage into goldenimage Date: Mon, 6 Dec 2021 16:35:09 +0100 Message-Id: <20211206153511.34838-3-foss+yocto@0leil.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206153511.34838-1-foss+yocto@0leil.net> References: <20211206153511.34838-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Dec 2021 15:35:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159244 golden image has a more explicit meaning in addition of not being an issue wrt inclusivity. Signed-off-by: Quentin Schulz --- meta/lib/oeqa/controllers/masterimage.py | 10 +++++----- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- .../initrdscripts/files/init-install-efi-testfs.sh | 2 +- .../initrdscripts/files/init-install-testfs.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 2eff6d05ef9..feb30366323 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py @@ -121,17 +121,17 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta # base class just sets the ssh log file for us super(MasterImageHardwareTarget, self).deploy() self.master = sshcontrol.SSHControl(ip=self.ip, logfile=self.sshlog, timeout=600, port=self.port) - status, output = self.master.run("cat /etc/masterimage") + status, output = self.master.run("cat /etc/goldenimage") if status != 0: - # We're not booted into the master image, so try rebooting - bb.plain("%s - booting into the master image" % self.pn) + # We're not booted into the golden image, so try rebooting + bb.plain("%s - booting into the golden image" % self.pn) self.power_ctl("cycle") self._wait_until_booted() bb.plain("%s - deploying image on target" % self.pn) - status, output = self.master.run("cat /etc/masterimage") + status, output = self.master.run("cat /etc/goldenimage") if status != 0: - bb.fatal("No ssh connectivity or target isn't running a master image.\n%s" % output) + bb.fatal("No ssh connectivity or target isn't running a golden image.\n%s" % output) if self.user_cmds: self.deploy_cmds = self.user_cmds.split("\n") try: diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index 60a5fbbfbfd..a0bbed0b581 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -13,7 +13,7 @@ class SSHTest(OERuntimeTestCase): def test_ssh(self): (status, output) = self.target.run('uname -a') self.assertEqual(status, 0, msg='SSH Test failed: %s' % output) - (status, output) = self.target.run('cat /etc/masterimage') - msg = "This isn't the right image - /etc/masterimage " \ + (status, output) = self.target.run('cat /etc/goldenimage') + msg = "This isn't the right image - /etc/goldenimage " \ "shouldn't be here %s" % output self.assertEqual(status, 1, msg=msg) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh index b351985a61c..6f554f62967 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh @@ -133,7 +133,7 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /rootmnt echo "Copying rootfs files..." cp -a /rootmnt/* /ssd -touch /ssd/etc/masterimage +touch /ssd/etc/goldenimage if [ -d /ssd/etc/ ] ; then # We dont want udev to mount our root device while we're booting... diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh index ac621605287..df3a7767319 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh @@ -158,7 +158,7 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root echo "Copying rootfs files..." cp -a /src_root/* /tgt_root -touch /tgt_root/etc/masterimage +touch /tgt_root/etc/goldenimage if [ -d /tgt_root/etc/ ] ; then echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab From patchwork Mon Dec 6 15:35:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 994AFC433FE for ; Mon, 6 Dec 2021 15:35:39 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web10.53186.1638804937995942802 for ; Mon, 06 Dec 2021 07:35:38 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: from localhost.localdomain (84-115-236-2.cable.dynamic.surfer.at [84.115.236.2]) (Authenticated sender: foss@0leil.net) by relay10.mail.gandi.net (Postfix) with ESMTPA id 23704240007; Mon, 6 Dec 2021 15:35:35 +0000 (UTC) From: Quentin Schulz To: openembedded-core@lists.openembedded.org Cc: Quentin Schulz Subject: [PATCH 3/4] oeqa: rename masterimage into goldenimage Date: Mon, 6 Dec 2021 16:35:10 +0100 Message-Id: <20211206153511.34838-4-foss+yocto@0leil.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206153511.34838-1-foss+yocto@0leil.net> References: <20211206153511.34838-1-foss+yocto@0leil.net> MIME-Version: 1.0 X-GND-Spam-Score: 150 X-GND-Status: SPAM List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Dec 2021 15:35:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159245 Golden image has a more explicit meaning than masterimage and is not an issue wrt inclusivity. Signed-off-by: Quentin Schulz --- .../{masterimage.py => goldenimage.py} | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) rename meta/lib/oeqa/controllers/{masterimage.py => goldenimage.py} (91%) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/goldenimage.py similarity index 91% rename from meta/lib/oeqa/controllers/masterimage.py rename to meta/lib/oeqa/controllers/goldenimage.py index feb30366323..fb1ac7a53a0 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/goldenimage.py @@ -24,12 +24,12 @@ from oeqa.utils import CommandError from abc import ABCMeta, abstractmethod -class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta): +class GoldenImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta): supported_image_fstypes = ['tar.gz', 'tar.bz2'] def __init__(self, d): - super(MasterImageHardwareTarget, self).__init__(d) + super(GoldenImageHardwareTarget, self).__init__(d) # target ip addr = d.getVar("TEST_TARGET_IP") or bb.fatal('Please set TEST_TARGET_IP with the IP address of the machine you want to run the tests on.') @@ -61,8 +61,8 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta if not os.path.isfile(self.kernel): bb.fatal("No kernel found. Expected path: %s" % self.kernel) - # master ssh connection - self.master = None + # golden ssh connection + self.golden = None # if the user knows what they are doing, then by all means... self.user_cmds = d.getVar("TEST_DEPLOY_CMDS") self.deploy_cmds = None @@ -119,9 +119,9 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta def deploy(self): # base class just sets the ssh log file for us - super(MasterImageHardwareTarget, self).deploy() - self.master = sshcontrol.SSHControl(ip=self.ip, logfile=self.sshlog, timeout=600, port=self.port) - status, output = self.master.run("cat /etc/goldenimage") + super(GoldenImageHardwareTarget, self).deploy() + self.golden = sshcontrol.SSHControl(ip=self.ip, logfile=self.sshlog, timeout=600, port=self.port) + status, output = self.golden.run("cat /etc/goldenimage") if status != 0: # We're not booted into the golden image, so try rebooting bb.plain("%s - booting into the golden image" % self.pn) @@ -129,7 +129,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta self._wait_until_booted() bb.plain("%s - deploying image on target" % self.pn) - status, output = self.master.run("cat /etc/goldenimage") + status, output = self.golden.run("cat /etc/goldenimage") if status != 0: bb.fatal("No ssh connectivity or target isn't running a golden image.\n%s" % output) if self.user_cmds: @@ -156,10 +156,10 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta def stop(self): bb.plain("%s - reboot/powercycle target" % self.pn) - self.power_cycle(self.master) + self.power_cycle(self.golden) -class SystemdbootTarget(MasterImageHardwareTarget): +class SystemdbootTarget(GoldenImageHardwareTarget): def __init__(self, d): super(SystemdbootTarget, self).__init__(d) @@ -184,16 +184,16 @@ class SystemdbootTarget(MasterImageHardwareTarget): def _deploy(self): # make sure these aren't mounted - self.master.run("umount /boot; umount /mnt/testrootfs; umount /sys/firmware/efi/efivars;") + self.golden.run("umount /boot; umount /mnt/testrootfs; umount /sys/firmware/efi/efivars;") # from now on, every deploy cmd should return 0 # else an exception will be thrown by sshcontrol - self.master.ignore_status = False - self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) - self.master.copy_to(self.kernel, "~/test-kernel") + self.golden.ignore_status = False + self.golden.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) + self.golden.copy_to(self.kernel, "~/test-kernel") for cmd in self.deploy_cmds: - self.master.run(cmd) + self.golden.run(cmd) def _start(self, params=None): - self.power_cycle(self.master) + self.power_cycle(self.golden) # there are better ways than a timeout but this should work for now time.sleep(120) From patchwork Mon Dec 6 15:35:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B052C43219 for ; Mon, 6 Dec 2021 15:35:39 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web10.53187.1638804938788681578 for ; Mon, 06 Dec 2021 07:35:39 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: from localhost.localdomain (84-115-236-2.cable.dynamic.surfer.at [84.115.236.2]) (Authenticated sender: foss@0leil.net) by relay10.mail.gandi.net (Postfix) with ESMTPA id 14DCC240018; Mon, 6 Dec 2021 15:35:36 +0000 (UTC) From: Quentin Schulz To: openembedded-core@lists.openembedded.org Cc: Quentin Schulz Subject: [PATCH 4/4] core: udev: udev-extraconf: rename mount.blacklist* to mount.blocklist.* Date: Mon, 6 Dec 2021 16:35:11 +0100 Message-Id: <20211206153511.34838-5-foss+yocto@0leil.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206153511.34838-1-foss+yocto@0leil.net> References: <20211206153511.34838-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Dec 2021 15:35:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159246 blocklist has a more obvious meaning than blacklist and is also not an issue wrt inclusivity, so let's use that naming instead. Signed-off-by: Quentin Schulz --- .../initrdscripts/files/init-install-efi-testfs.sh | 2 +- .../initrdscripts/files/init-install-efi.sh | 2 +- .../initrdscripts/files/init-install-testfs.sh | 2 +- meta/recipes-core/initrdscripts/files/init-install.sh | 2 +- .../{mount.blacklist => mount.blocklist} | 0 meta/recipes-core/udev/udev-extraconf/mount.sh | 4 ++-- meta/recipes-core/udev/udev-extraconf_1.1.bb | 10 +++++----- meta/recipes-extended/parted/files/run-ptest | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) rename meta/recipes-core/udev/udev-extraconf/{mount.blacklist => mount.blocklist} (100%) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh index 6f554f62967..9bf32e8cb4e 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh @@ -138,7 +138,7 @@ touch /ssd/etc/goldenimage if [ -d /ssd/etc/ ] ; then # We dont want udev to mount our root device while we're booting... if [ -d /ssd/etc/udev/ ] ; then - echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist + echo "/dev/${device}" >> /ssd/etc/udev/mount.blocklist fi fi diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index f667518b895..97db4c753b9 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -229,7 +229,7 @@ if [ -d /tgt_root/etc/ ] ; then echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo "${device}" >> /tgt_root/etc/udev/mount.blacklist + echo "${device}" >> /tgt_root/etc/udev/mount.blocklist fi fi diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh index df3a7767319..ea74806a7b7 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh @@ -164,7 +164,7 @@ if [ -d /tgt_root/etc/ ] ; then echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist + echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blocklist fi fi umount /tgt_root diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index e71579631b5..1f7dab8a967 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -261,7 +261,7 @@ if [ -d /tgt_root/etc/ ] ; then echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo "${device}" >> /tgt_root/etc/udev/mount.blacklist + echo "${device}" >> /tgt_root/etc/udev/mount.blocklist fi fi umount /tgt_root diff --git a/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/meta/recipes-core/udev/udev-extraconf/mount.blocklist similarity index 100% rename from meta/recipes-core/udev/udev-extraconf/mount.blacklist rename to meta/recipes-core/udev/udev-extraconf/mount.blocklist diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index b23731870ea..41b7c775c25 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh @@ -26,11 +26,11 @@ fi PMOUNT="/usr/bin/pmount" -for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*` +for line in `grep -h -v ^# /etc/udev/mount.blocklist /etc/udev/mount.blocklist.d/*` do if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ]; then - logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" + logger "udev/mount.sh" "[$DEVNAME] mounting is blocked, ignoring" exit 0 fi done diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 2ba35b0df69..42ba687ed8b 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb @@ -1,13 +1,13 @@ SUMMARY = "Extra machine specific configuration files" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -DESCRIPTION = "Extra machine specific configuration files for udev, specifically blacklist information." +DESCRIPTION = "Extra machine specific configuration files for udev, specifically blocklist information." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = " \ file://automount.rules \ file://mount.sh \ - file://mount.blacklist \ + file://mount.blocklist \ file://autonet.rules \ file://network.sh \ file://localextra.rules \ @@ -23,8 +23,8 @@ do_install() { install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules - install -d ${D}${sysconfdir}/udev/mount.blacklist.d - install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -d ${D}${sysconfdir}/udev/mount.blocklist.d + install -m 0644 ${WORKDIR}/mount.blocklist ${D}${sysconfdir}/udev/ install -d ${D}${sysconfdir}/udev/scripts/ @@ -37,7 +37,7 @@ do_install() { FILES:${PN} = "${sysconfdir}/udev" RDEPENDS:${PN} = "udev" -CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist" +CONFFILES:${PN} = "${sysconfdir}/udev/mount.blocklist" # to replace udev-extra-rules from meta-oe RPROVIDES:${PN} = "udev-extra-rules" diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest index c3d6fca3391..1eee9f3b730 100644 --- a/meta/recipes-extended/parted/files/run-ptest +++ b/meta/recipes-extended/parted/files/run-ptest @@ -1,7 +1,7 @@ #!/bin/sh -mkdir -p /etc/udev/mount.blacklist.d -echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp +mkdir -p /etc/udev/mount.blocklist.d +echo /dev/sda1 >> /etc/udev/mount.blocklist.d/parted-tmp rm -f tests/*.log make -C tests test-suite.log -rm /etc/udev/mount.blacklist.d/parted-tmp +rm /etc/udev/mount.blocklist.d/parted-tmp