From patchwork Thu Apr 13 20:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 22612 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 DFE34C77B61 for ; Thu, 13 Apr 2023 20:01:50 +0000 (UTC) Received: from APC01-PSA-obe.outbound.protection.outlook.com (APC01-PSA-obe.outbound.protection.outlook.com [40.107.255.57]) by mx.groups.io with SMTP id smtpd.web11.1537.1681416099265600062 for ; Thu, 13 Apr 2023 13:01:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=M94rTSnP; spf=pass (domain: advantech.cz, ip: 40.107.255.57, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ODsGQWbd/vJXm4ckZTioTCmujpAPF+zkmNgyP6wN4vdjsnCKlsiVQy4CBF1BPOebsp864t4/lAw3S9Vw3ZCzfjoTRSjilnFeq7XGepmxRFCUANWs92URnVuNaqtqGWZXZ+b6a+i3ECG0FIcG9VOy4GABvfUmCFAtDcxWDd96CMvFs72WLwG4UAnsUgy4c1XwDaaAywFm0QM153qXirfzbN2jh1Ay+hUZZ5X6MIPQCY+qb6FaCLUCMNgBR6W0lJcc0zQWvaV+UFfWsqH7NV/iokgb7LVbyWZ37O/0IEsfAAi9Ig0R9kzdUdAyP7PzwQYOpAOfPzCK+8eFPMO9mKy4iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I78AKenlLBKBzTMSazXbqONEeU5NVSOEtpNqqa+gKjw=; b=LQJ614WmFiQSDD+KDN1y+ip3cv56YiyGWhtxK24Txm06BPQ9EeOc9jz4P09fPw1ZhSpfRUzXTT+FLEXXUNRSvhBxnxv9SY7KMDtpJGoYyG9vxB1inZijz3Xq2jVKJWqGV3y1iWaLx+BNZc+wdGKRLMLp1DW6yHdvls2NpgGRjjyWev9EFUDI8enmgpqiJl2K37oz50BzIevOdq2OUo6I/9yGkEPKfvh2W/RUxmISVVJqMoGSs4GgnngejTS2xFz2VBz5eYv/wCIqU3PAJ7wW8spVG+3kg1pVM1u+l3ou41FWoQDbPZtfrfbcGgdDm1ciLiSL3xyXVNiOLAEzZT1vow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=advantech.cz; dmarc=pass action=none header.from=advantech.cz; dkim=pass header.d=advantech.cz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=advantech.cz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I78AKenlLBKBzTMSazXbqONEeU5NVSOEtpNqqa+gKjw=; b=M94rTSnP/AStFVP2IqiugoLNWysJvF26RbWGZOZlI0Ifw4VcYHo6rm7hRAaTAdTJArICfH7Mwgdd/EpCt+qUas8Nv9BdwKt4pmnBy8T+bMrgBgh0MwooYZx51rGYt/1NOXrrTP0kVrBPsiFo+jKgZ8KKKnsH1MYnm7ZWj19NdPxnMyAxs5PNxzdZS/pDshuJFzczv+NxsRrYPSkJ0L6emNIqFA5Ot8wwvrkedn2VHh9d05K3QAERaHq6VTk0fnDr+j2+NP5vN7wcR+2GBxfdwsILqJB3WFvZcUVoon+hp0D0eXqrOUeN9ACnUKmIuFvULzfXUsHabpIXu/EJRkkYeQ== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by SG2PR02MB4299.apcprd02.prod.outlook.com (2603:1096:0:7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 20:01:34 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::624d:2113:5376:e9b2]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::624d:2113:5376:e9b2%6]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 20:01:34 +0000 From: Petr Gotthard To: OpenEmbedded Devel List Subject: [meta-webserver][PATCH] cockpit: upgrade 276 -> 289 Thread-Topic: [meta-webserver][PATCH] cockpit: upgrade 276 -> 289 Thread-Index: AdluQj+Al9OYG8yaQEWA9rzFe0ko9g== Date: Thu, 13 Apr 2023 20:01:34 +0000 Message-ID: Accept-Language: en-US Content-Language: cs-CZ X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=advantech.cz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TY2PR02MB3678:EE_|SG2PR02MB4299:EE_ x-ms-office365-filtering-correlation-id: dcac0ac7-2333-4f19-ab2f-08db3c59e228 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: k29PBGRLWAWf8xXOuDqdkg0Ao0tMf83gJ5Fl0aDh5WS/fxTwHxYZgQOG2Vdo8Z0NcJfRtUb7gemJTrlodkUmuRxJyk820k0vyFS5FfL/Te8EW3hjbGjN4Eecmd6/EHe6hlHG2MXpmRXz9/+OJ87khCV5zTHLkxPb0mdpQXjPifjSHpXQd368DH9fQTHk6cbSLqPGgrn/7Vpml/MM2oFAJ/4Fi6GMsXxXhYwwc0sWNCb0KFLMEi5xAXqeGjS1x/tfNggcQQt8XqAQ+lbEq2VsjR05mHyMJfmFY5DJqC+6VNU5JObeASR23mwsJOnYNNttLPrn1t7dTrNy0VRpc9ZMUlY/S331pai7kqVGxCcStFq5fi8aqqsyW0Ad7Mr6yMO4cxmkMuqQFEvDpLkJ3jSbw//kriCSzxFat8p4Nbtgd3CsPQ4ZVVfvA8KqdUC62vp8KkaAzm3leGBjgvjuJN75CHUvh9shTc2mXTToPU5WdhP6vYNxX8HnqWW47QyDwwvrHySVoTo7hHeQKwOFqSitJiZPth1jV/jd4lzhRtyM2/KONpEWFKyhh0nbITIG7LFzfiuqBH4nqt7tk5NuvLbPWoZmfFh+JG404kDwqjgWQJw= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB3678.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(39860400002)(376002)(396003)(366004)(136003)(451199021)(76116006)(83380400001)(66574015)(966005)(478600001)(7696005)(71200400001)(33656002)(26005)(9686003)(186003)(6506007)(2906002)(52536014)(38100700002)(5660300002)(122000001)(64756008)(66556008)(66946007)(66476007)(41300700001)(53546011)(66446008)(38070700005)(6916009)(8676002)(44832011)(8936002)(55016003)(86362001)(316002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?VagDd++SRa7ni5GCl5dps4trrjCM?= =?utf-8?q?gLtXJJLvGwPDy6kNhkI/MICTeLT5b46Q0eB2K12v4bFrw8BiTQG3KP5cYezRZRwCh?= =?utf-8?q?yFRxGUyukTvO6Yvl8GjBYM5vT4VWiNFXgk1ZslSDhWbpE/LuPzZw/+8VLP2lsqCd9?= =?utf-8?q?1NdWwG9knUfZdk8utWzncNRU2LkVIifvPCdR1PSGd2R2kF73dAU+5evecvuVmRIPg?= =?utf-8?q?FX/EPa1reVkdLOopyX1hpGzRe4i+osXsmFlj05gYdlElzNPdrx+0N47TvP+9fpvpo?= =?utf-8?q?/utM1wpD1qrmPDYa5Xjsf5UfVsuPC++UuX7L4iBQIY/3eO0rFKabOHwl3i/BVWLSd?= =?utf-8?q?Olb/adXbdKJ4UVowoX7xf2y2/KWmlGNDbc34XveEd4nd0q7U2OfBX4U4Gh4rBjo2Y?= =?utf-8?q?eU+8hWo5LxIFeIbAmhnkkCtO4yGDnAFcpKhFC/9VxIoEB8rPIhc/FxH80TAuY2Hb9?= =?utf-8?q?Rpfl40yeAhBSbT3pHQyonN4D4eut1pXqTfIZ6mfWOZX7To4ZPnshnjTCroLQIqYEx?= =?utf-8?q?UEDXAkp9K8Wgp4tfaB6ue9wNoeyxQuQhOSoISWRl9KgPll+LOlLhXFAyQ0l4VQZfR?= =?utf-8?q?W05yRJb+tY8Rr7xeEj3ZTo6SW78i7AEnaR24uT/hJdDj2hJHjuLN3pzRcnGgI6ZbP?= =?utf-8?q?UK+hvpJT2EqZkyld57zsjmQZxK+7oaDFcoGX7IL/XEwMXet7xMjxW775BlY5MmOyq?= =?utf-8?q?R8CZIiIsjOmWulePtpETLljfAJKSaGNR8bEvXRdNYrC9/PBTrVMIYsfuRBEhwU/4c?= =?utf-8?q?t0IAw3OTaoyBAy6QDfyOzDgAQ2VaZewODoOC7B78mqrLwDkb6VDW0oEr6kHyXwh92?= =?utf-8?q?/28uU9E4Ig0AkmCrcMBbLd10H4ngrGfkGl2RB0rhK4r45kC2wdSUnppjzeA9gl6vZ?= =?utf-8?q?lTCg3XVF+gCzekBRWn9trepodErmH+JUNMQNG2eMFb4Amf4p0QT1fdfHPeAArzPAt?= =?utf-8?q?u8wWO4Lz9eXiOYpfrlOJZiEYCu0Og0f6o/vOXbNX/WreIak/RB2DHzBqSg4U8IqPY?= =?utf-8?q?XM3G7Ym9/IcZ5h0akkz42PEbWKtk4JI5aLjiL52qMP5jHBZ+obxhpHVZptWZePzBd?= =?utf-8?q?RkWrGbync7cl3rhh+XJFLT2+WX2Hh4buN+3c/j6W73fpqmxiAznNsPvIMlepIf3X+?= =?utf-8?q?Q27dtRadmq9P6ebLGUv0hVE9xWXu/24PTeme4xS5VQ3+YgS8Betbu8U6ait7IbDih?= =?utf-8?q?7A52GqFr+xSoyrVLmXE65u2GwG0tKzKljPqraVbhfDNWp2zqIbGIP1FXIe23fz4+v?= =?utf-8?q?q2cS14ZFKbPzVw1v5HJiOJg3Cd+GCfp/i2MkrtDpzd2dzDQ28YBkzBEpTVK1p+/Y5?= =?utf-8?q?4V/py6FIEgVhOZ1f2q7e2RQmSXF3RpY1F7tdT8fpQ9DEs2dRJVDLxw8c+LpxPaX0J?= =?utf-8?q?NqO9Bho9cDK9Ww9kbJihHJrLc+4uzOWE/rqu5AaZ4oeeT6BV3dSQSN2Aeex+U+zQi?= =?utf-8?q?SMwVWZbFUuozEnH6VjX19ZYk4pz7t06Lp5F1TyJjdZkBhfDtRJnR53aUhGU7x/sPc?= =?utf-8?q?wbl+2KQEAY80NdSMGKXY9OXIQ+pOunPvxA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: advantech.cz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB3678.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcac0ac7-2333-4f19-ab2f-08db3c59e228 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2023 20:01:34.6634 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a77d40d9-dcba-4dda-b571-5f18e6da853f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TYcN8J01hzZeiq+OvZYBpJaMdh4fGGVpQNab7Eog9T16Ah9Jg6ZsC1V9UqehzkVD6dIr2mwCNqIMfuHfa5jmZ7sQ5ZkPsWt5ZEWslAbXOck= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR02MB4299 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 ; Thu, 13 Apr 2023 20:01:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102082 Changes are described for each release in the blog: https://cockpit-project.org/blog/cockpit-277.html https://cockpit-project.org/blog/cockpit-278.html https://cockpit-project.org/blog/cockpit-279.html https://cockpit-project.org/blog/cockpit-280.html https://cockpit-project.org/blog/cockpit-281.html https://cockpit-project.org/blog/cockpit-282.html https://cockpit-project.org/blog/cockpit-283.html https://cockpit-project.org/blog/cockpit-284.html https://cockpit-project.org/blog/cockpit-285.html https://cockpit-project.org/blog/cockpit-286.html https://cockpit-project.org/blog/cockpit-287.html https://cockpit-project.org/blog/cockpit-288.html https://cockpit-project.org/blog/cockpit-289.html Signed-off-by: Petr Gotthard --- .../{cockpit_276.bb => cockpit_289.bb} | 11 ++-- ...n-not-error-if-xsltproc-is-not-found.patch | 12 ++-- ...01-remove-tests-dep-on-gobject-intro.patch | 60 ------------------- ...e-use-copy-rule-for-unmodified-files.patch | 47 --------------- 4 files changed, 12 insertions(+), 118 deletions(-) rename meta-webserver/recipes-webadmin/cockpit/{cockpit_276.bb => cockpit_289.bb} (94%) delete mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch delete mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch -- 2.34.1 diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb similarity index 94% rename from meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb rename to meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb index 93198e356..2f920b417 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb @@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI += " \ https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ - file://0001-remove-tests-dep-on-gobject-intro.patch \ - file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ file://cockpit.pam \ " -SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" +SRC_URI[sha256sum] = "3f8e369b21dbe9f5e05ac6ffd8c7a58ad5759065bea29b3b14c937a17f030eb5" inherit gettext pkgconfig autotools systemd features_check @@ -92,7 +90,10 @@ FILES:${PN}-storaged = " \ ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ " -FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +FILES:${PN}-networkmanager = " \ + ${datadir}/cockpit/networkmanager \ + ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \ +" RDEPENDS:${PN}-networkmanager = "networkmanager" FILES:${PN}-machines = " \ @@ -130,6 +131,8 @@ FILES:${PN}-ws = " \ ${systemd_system_unitdir}/cockpit.service \ ${systemd_system_unitdir}/cockpit-motd.service \ ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-session.socket \ + ${systemd_system_unitdir}/cockpit-session@.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch index b3b0988b1..db583cfd2 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -1,27 +1,25 @@ -From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From 7c1f95995ce9180221bac03b7b1e1696b8a79de7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Sep 2022 11:12:28 -0700 Subject: [PATCH] Warn not error if xsltproc is not found Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Khem Raj + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7659f41..537203e 100644 +index 6896c19..2a1fb52 100644 --- a/configure.ac +++ b/configure.ac -@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) +@@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) # package as xgettext, and we find them by PATH, so just check for the one. - AC_PATH_PROG([XGETTEXT], [xsltproc], [no]) + AC_PATH_PROG([XGETTEXT], [xgettext], [no]) if test "$XGETTEXT" = "no"; then - AC_MSG_ERROR([Please install gettext tools]) + AC_MSG_WARN([Please install gettext tools]) fi # ssh-add --- -2.37.3 - diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch deleted file mode 100644 index b633cb0cf..000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer -Date: Wed, 4 Dec 2019 17:23:46 +0100 -Subject: [PATCH] remove tests dep on gobject-intro - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/ws/Makefile-ws.am | 54 --------------------------------------------------- - 1 file changed, 54 deletions(-) - ---- a/src/ws/Makefile-ws.am -+++ b/src/ws/Makefile-ws.am -@@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared - pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c - - # ----------------------------------------------------------------------------- --# test-server: server for running the html/browser unit tests against -- --check_PROGRAMS += test-server -- --test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) --test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) -- --test_server_SOURCES = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --test_server_CPPFLAGS += -I$(top_builddir)/src/ws --nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED) -- --BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) --CLEANFILES += $(GDBUS_CODEGEN_GENERATED) --GDBUS_CODEGEN_GENERATED = \ -- src/ws/mock-dbus-tests.h \ -- src/ws/mock-dbus-tests.c \ -- $(NULL) -- --EXTRA_DIST += $(GDBUS_CODEGEN_XML) --GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml -- --GDBUS_CODEGEN_INVOCATION = \ -- $(AM_V_GEN) gdbus-codegen \ -- --interface-prefix com.redhat.Cockpit.DBusTests \ -- --c-namespace Test \ -- --c-generate-object-manager \ -- $(NULL) -- --src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< -- --src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< -- --# ----------------------------------------------------------------------------- - # Unit tests - - check_SCRIPTS += src/ws/mock-cat-with-init diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch deleted file mode 100644 index 1e5cf09d1..000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 -From: Michael Haener -Date: Wed, 25 Mar 2020 08:32:07 +0100 -Subject: [PATCH] fix(makefile): use copy rule for unmodified files - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - pkg/Makefile.am | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) - %.metainfo.xml: %.metainfo.xml.in - $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ - -+dist/playground/hammer.gif: pkg/playground/hammer.gif -+ $(COPY_RULE) -+ -+dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png -+ $(COPY_RULE) -+ -+dist/apps/default.png: pkg/apps/default.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-error.png: pkg/shell/images/server-error.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-large.png: pkg/shell/images/server-large.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-small.png: pkg/shell/images/server-small.png -+ $(COPY_RULE) -+ -+dist/shell/index.html: pkg/shell/index.html -+ $(COPY_RULE) -+ - metainfodir = ${datarootdir}/metainfo - nodist_metainfo_DATA = \ - pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \