Hi Davide, Il giorno Tue, 3 May 2022 10:03:09 +0200 "Davide Gardenal" <[email protected]> ha scritto:
> When creating the manifest and the testdata.json links, if the link > name is equal to the output name the link is not created, otherwise > it is. This prevents a link-to-self in the first case. > > Signed-off-by: Davide Gardenal <[email protected]> > --- > meta/classes/rootfs-postcommands.bbclass | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/rootfs-postcommands.bbclass > b/meta/classes/rootfs-postcommands.bbclass index > 7b92df69c5..c949115647 100644 --- > a/meta/classes/rootfs-postcommands.bbclass +++ > b/meta/classes/rootfs-postcommands.bbclass @@ -267,9 +267,10 @@ > python write_image_manifest () { > if os.path.exists(manifest_name) and link_name: > manifest_link = deploy_dir + "/" + link_name + ".manifest" > - if os.path.lexists(manifest_link): > - os.remove(manifest_link) > - os.symlink(os.path.basename(manifest_name), manifest_link) > + if manifest_link != manifest_name > + if os.path.lexists(manifest_link): > + os.remove(manifest_link) > + os.symlink(os.path.basename(manifest_name), This change is mixing tabs and spaces. > # Can be used to create /etc/timestamp during image construction to > give a reasonably @@ -339,9 +340,10 @@ python write_image_test_data() > { > if os.path.exists(testdata_name) and link_name: > testdata_link = os.path.join(deploy_dir, "%s.testdata.json" > % link_name) > - if os.path.lexists(testdata_link): > - os.remove(testdata_link) > - os.symlink(os.path.basename(testdata_name), testdata_link) > + if testdata_link != testdata_name: > + if os.path.lexists(testdata_link): > + os.remove(testdata_link) > + os.symlink(os.path.basename(testdata_name), And this as well. Can you send v2 with spaces-only indentation? Best regards, -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165197): https://lists.openembedded.org/g/openembedded-core/message/165197 Mute This Topic: https://lists.openembedded.org/mt/90854718/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
