From patchwork Thu Mar 9 08:40:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 20628 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 64C9DC61DA4 for ; Thu, 9 Mar 2023 08:40:49 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.8637.1678351242672699912 for ; Thu, 09 Mar 2023 00:40:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=pTG51eLR; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=2432b52167=changqing.li@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3297mUE9002619 for ; Thu, 9 Mar 2023 08:40:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=PPS06212021; bh=p38yZQEn/w2JyDaE9jRlhUjH0vc529fdG4Kj4wOPJfY=; b=pTG51eLRAdcBbB6QZWqZgwtq3hdlyZmf4MpC3TqkAoVLOq1bApJnhZt2iEe5urtsH/Qs AQ3xbZLhEla/enQGvksWgEUAe01dfab5CVV8kHVPKI5T2ZExYLdNHr+7yYSSIzzXoWz8 p2Ur4mLLQeVQFHuNFkDHjmXWGyVhfRYjQ/LPtuxIDNj+mBbRXQ5J9+wurZ59tImv1ufV j1G/WRvSWuMSfe6UqiEPhK37mI+aT9GTSK6nxBZ9p9NfKOu8JRnX3fEiJiEHPntBvbz4 uTTQtnKwjkgDoIPmcFYbPLCtMMmqcqIYBFdja8edv7Mq+pkPBMThf1xMpA6OSNxzVbPs uQ== Received: from ala-exchng02.corp.ad.wrs.com (unknown-82-254.windriver.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p6fg6hdn7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 09 Mar 2023 08:40:41 +0000 Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.18; Thu, 9 Mar 2023 00:40:40 -0800 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.17 via Frontend Transport; Thu, 9 Mar 2023 00:40:39 -0800 From: To: Subject: [meta-oe][PATCH] liblockfile: upgrade 1.14 -> 1.17 Date: Thu, 9 Mar 2023 16:40:38 +0800 Message-ID: <20230309084038.1182832-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: y7BRm6JfSYfb8UdcWVbStSGWOiegpCcc X-Proofpoint-GUID: y7BRm6JfSYfb8UdcWVbStSGWOiegpCcc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-09_04,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 spamscore=0 priorityscore=1501 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303090067 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, 09 Mar 2023 08:40:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101442 From: Changqing Li Updated patches: configure.patch 0001-Makefile.in-redefine-LOCKPROG.patch Signed-off-by: Changqing Li --- ...akefile.in-Don-t-try-to-run-ldconfig.patch | 12 +++---- .../0001-Makefile.in-add-DESTDIR.patch | 6 ++-- ...001-Makefile.in-install-nfslock-libs.patch | 10 +++--- .../0001-Makefile.in-redefine-LOCKPROG.patch | 34 ++++++++++++++----- .../liblockfile/liblockfile/configure.patch | 22 ++++++++---- ...iblockfile-fix-install-so-to-man-dir.patch | 8 ++--- ...iblockfile_1.14.bb => liblockfile_1.17.bb} | 14 ++++---- 7 files changed, 67 insertions(+), 39 deletions(-) rename meta-oe/recipes-extended/liblockfile/{liblockfile_1.14.bb => liblockfile_1.17.bb} (72%) diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch index 5a1d9a995..0e814d4f5 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch @@ -1,4 +1,4 @@ -From 5876bd17caac96df70ef400bfeebb155c0bd7359 Mon Sep 17 00:00:00 2001 +From 4d07cbaddeed8fe283d77336a6432c4074450722 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 8 Feb 2023 10:34:45 +0800 Subject: [PATCH] Makefile.in: Don't try to run ldconfig @@ -27,10 +27,10 @@ Signed-off-by: Changqing Li 1 file changed, 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index bfa0acb..ae5be56 100644 +index 232f1b6..5754ca5 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -58,7 +58,6 @@ install_shared: shared install_static install_common +@@ -69,7 +69,6 @@ install_shared: shared install_static install_common $(libdir)/liblockfile.so.$(SOVER) ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so @@ -38,14 +38,14 @@ index bfa0acb..ae5be56 100644 install_common: install -d -m 755 -g root -p $(includedir) -@@ -79,7 +78,6 @@ install_nfslib: nfslib +@@ -90,7 +89,6 @@ install_nfslib: nfslib install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 - if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - clean: - rm -f *.a *.o *.so *.so.* dotlockfile + test: test-stamp + @: -- 2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch index ea415dd8b..2533b3a00 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch @@ -1,4 +1,4 @@ -From 67843dabe1177840697839b916fd899218893ec7 Mon Sep 17 00:00:00 2001 +From 8e370a2f35d0c3472ddc9068fab19d0077434c61 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 19 Jul 2018 00:25:23 -0700 Subject: [PATCH] Makefile.in: add DESTDIR @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 36a6d23..1e4130e 100644 +index 9c74b35..8cbda1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,11 +12,11 @@ CC = @CC@ @@ -50,5 +50,5 @@ index 36a6d23..1e4130e 100644 MAILGROUP = @MAILGROUP@ -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch index a6b297b59..f99ac2bf7 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch @@ -1,4 +1,4 @@ -From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From 0f34d1d91d641c3d5c5bb2eb11bd6eec7cfaf738 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 19 Jul 2018 01:00:10 -0700 Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 @@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 1e4130e..0f1b506 100644 +index 8cbda1d..3a74811 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -77,6 +77,8 @@ install_common: +@@ -88,6 +88,8 @@ install_common: install_nfslib: nfslib install -d -m 755 -g root -p $(nfslockdir) install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) @@ -25,7 +25,7 @@ index 1e4130e..0f1b506 100644 + ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - clean: + test: test-stamp -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch index 35549ff2d..c387db123 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-redefine-LOCKPROG.patch @@ -1,4 +1,4 @@ -From 9beb650712d448ad9c0899de9d98e9b623f9c249 Mon Sep 17 00:00:00 2001 +From 05227e74b732f13ed5a2a98232676f98bba028e6 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 12 Aug 2022 11:18:15 +0800 Subject: [PATCH] Makefile.in: redefine LOCKPROG @@ -11,23 +11,41 @@ And it should be "/usr/bin/dotlockfile" on the target. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu + +Update patch for 1.17, also redefine LOCKPROG in other lines +Signed-off-by: Changqing Li --- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6e53179..bfa0acb 100644 +index e447cb2..e02d75e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -42,7 +42,7 @@ dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o +@@ -44,19 +44,19 @@ dotlockfile: dotlockfile.o dlockfile.o + $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o dlockfile.o + + dotlockfile.o: dotlockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c dotlockfile.c lockfile.o: lockfile.c - $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ + $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ - -c lockfile.c + -DSTATIC -c lockfile.c + + solockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o solockfile.o + + dlockfile.o: lockfile.c +- $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \ ++ $(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \ + -c lockfile.c -o dlockfile.o - xlockfile.o: lockfile.c + install_static: static install_common -- 2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch index ea13e11d2..56f2d05eb 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch @@ -1,10 +1,17 @@ +From fd3fce8c1a3d0c70a0ffd461fbbe7e2ef71dd3a7 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 7 Mar 2023 11:05:45 +0800 +Subject: [PATCH] Update patch for 1.17 -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +Signed-off-by: Changqing Li +--- + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) ---- liblockfile-1.05/./configure.in~configure -+++ liblockfile-1.05/./configure.in +diff --git a/configure.ac b/configure.ac +index df26cee..76e9165 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1,4 +1,5 @@ -AC_INIT(lockfile.c) +AC_INIT @@ -12,7 +19,7 @@ AC_CONFIG_HEADER(autoconf.h) AC_REVISION($Revision: 1.0 $)dnl -@@ -111,7 +112,8 @@ +@@ -111,7 +112,8 @@ AC_SUBST(TARGETS) AC_SUBST(INSTALL_TARGETS) AC_SUBST(nfslockdir) @@ -23,3 +30,6 @@ -) +]) +AC_OUTPUT +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch index da2503339..046cd8e69 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch @@ -1,4 +1,4 @@ -From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001 +From 079d04c187800e22f18723c74e41c4e46eef67f8 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 19 Jul 2018 01:12:47 -0700 Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man @@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0f1b506..6e53179 100644 +index 3a74811..e447cb2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ install_common: +@@ -82,7 +82,7 @@ install_common: else \ install -g root -m 755 dotlockfile $(bindir); \ fi @@ -29,5 +29,5 @@ index 0f1b506..6e53179 100644 install_nfslib: nfslib -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb similarity index 72% rename from meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb rename to meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb index e07dab3c7..68123e35a 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3" -SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17-1.debian.tar.bz2;name=1.17-1 \ file://configure.patch \ file://0001-Makefile.in-add-DESTDIR.patch \ file://0001-Makefile.in-install-nfslock-libs.patch \ @@ -14,13 +14,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ file://0001-Makefile.in-Don-t-try-to-run-ldconfig.patch \ " -SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb" -SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060" +SRC_URI[md5sum] = "918c4c07f7b99fc327db8bf39d3a1804" +SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e" -SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479" -SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff" +SRC_URI[1.17-1.md5sum] = "40415c5702f82681d9811e4e9e182813" +SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673" -S = "${WORKDIR}/${BPN}" +S = "${WORKDIR}/${BP}" inherit autotools-brokensep