From patchwork Mon Apr 25 18:48:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 7148 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 4E269C6371A for ; Mon, 25 Apr 2022 19:26:15 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.34014.1650912517972877735 for ; Mon, 25 Apr 2022 11:48:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qcwt2EAU; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id 2so6455180pjw.2 for ; Mon, 25 Apr 2022 11:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lCLk15/roejrt9SARFqdnjGDjuibjMW2pnyxxfHDRAA=; b=qcwt2EAUr0Zrmb4AQthoOS0wJ1vlrSHjX09vdeINhixY5Dh4u/JeqrlloiyUMq8okC Se57U+MG7O+vd+kJy27v8guBXp1MaXIsaOExwNVxcdxHB5D1axOI3QEKY7FHRqDnJGHy uTIigU0AufW7NO3Ii8nmkSRXyavHkrE2jD5aNtRs54XxpeZKIiQfdpcPZb5rl3NAkYbY hI88r5cfStGams5/kZKF8zC5rv2REzGP71mya90CnCmI5Y1Y38jC0sNk5alS2VW4Cyun YfvORINvH7ayuv3d5E0W4I7m6J8DsMKxPqnifUdnIDHwJF3cbDPQ6WmQjdXLhQ6dKJ6m QZQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lCLk15/roejrt9SARFqdnjGDjuibjMW2pnyxxfHDRAA=; b=ctl5I7Xl2XIKM5jekKDjU3X25GzCAvoCeHNWB08dErpmk+2CNrDhOL++Y9qkmxfZIR oA99yM6aG0wPlACe2mNJZXQoOqzSZ33UCq9zmrA1Yc1xd1em5aqFJdvA4VoxyNqhUOzf 4562ZdiRH/R2gozLGpI3kPsdJhE3BnNxM8NuDdStTlpPi4Mtix8O1aHq86AKJr5b21lU Jd74w0RDVlO9F1vLoALbOGRg1pzFOcB4BlR2Q4e/WcFAukJjtypqzjkvW2ToZ7Penakx bCYlup+NSxRJFGl9GaIceepyllQo40SA/D+y/9POLExwO6Snynhboa0+GJmH9xwdOPrd 7wFg== X-Gm-Message-State: AOAM532z8Xa1QJrCXcYTfzLveFuLd/lEyHa2FadPBo+GHyDD73+yS4FD 7HJwa7xdL5YjDr6G/OVPHz+JKE5PbRW3GA== X-Google-Smtp-Source: ABdhPJxv8ddLWjTFnDSi+2Bo0QFKiZXUKzE3TrDgM7Td/FG9PXnh8UXTsK6TIiwa9UflNekz2dfTKA== X-Received: by 2002:a17:902:ce81:b0:15d:29ba:7808 with SMTP id f1-20020a170902ce8100b0015d29ba7808mr2558189plg.153.1650912517056; Mon, 25 Apr 2022 11:48:37 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id k15-20020a63ab4f000000b00381eef69bfbsm10403213pgp.3.2022.04.25.11.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 11:48:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Mingli Yu , Khem Raj Subject: [meta-oe][PATCH v2] makedumpfile: Upgrade to 1.7.1 Date: Mon, 25 Apr 2022 11:48:34 -0700 Message-Id: <20220425184834.1955021-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 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, 25 Apr 2022 19:26:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96782 From: Mingli Yu Remove related man pages gz logic as it's removed in new version [1]. [1] https://github.com/makedumpfile/makedumpfile/commit/2169de66ecd4504a3e69e0be0330f492f966ce5e Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- v2: Fix a typo -D$(ARCH) should be -D__$(ARCH)__ ...makedumpfile-replace-hardcode-CFLAGS.patch | 53 +++++++++---------- ...umpfile_1.7.0.bb => makedumpfile_1.7.1.bb} | 8 +-- 2 files changed, 26 insertions(+), 35 deletions(-) rename meta-oe/recipes-kernel/makedumpfile/{makedumpfile_1.7.0.bb => makedumpfile_1.7.1.bb} (85%) diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index 1dd87c8b11..f3dc8a466a 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -1,6 +1,6 @@ -From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001 +From 71b5a3905d5cd0feca88a0d61d7657ba5296a052 Mon Sep 17 00:00:00 2001 From: Mingli Yu -Date: Thu, 21 Jul 2016 18:06:21 +0800 +Date: Sun, 24 Apr 2022 17:25:33 +0800 Subject: [PATCH] makedumpfile: replace hardcode CFLAGS * Create alias for target such as powerpc as powerpc32 @@ -16,9 +16,12 @@ Signed-off-by: Mingli Yu [2021-11-18] Patch updated to use CFLAGS_COMMON for zstd Signed-off-by: Fathi Boudra + +Rebase to 1.7.1 +Signed-off-by: Mingli Yu --- - Makefile | 47 ++++++++++++++++++++++++----------------------- - 1 file changed, 24 insertions(+), 23 deletions(-) + Makefile | 42 ++++++++++++++++++++++-------------------- + 1 file changed, 22 insertions(+), 20 deletions(-) --- a/Makefile +++ b/Makefile @@ -35,19 +38,13 @@ Signed-off-by: Fathi Boudra HOST_ARCH := $(shell uname -m) # Use TARGET as the target architecture if specified. # Defaults to uname -m -@@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),) - TARGET := $(HOST_ARCH) - endif - --ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -- -e s/arm.*/arm/ -e s/sa110/arm/ \ -- -e s/s390x/s390/ -e s/parisc64/parisc/ \ +@@ -24,26 +18,34 @@ endif + ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/) -+ARCH := $(shell echo __${TARGET}__ | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -+ -e s/arm.*/arm/ -e s/sa110/arm/ \ -+ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -+ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \ -+ -e s/_powerpc_/_powerpc32_/) ++ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \ ++ -e s/_powerpc_/_powerpc32_/) CROSS := ifneq ($(TARGET), $(HOST_ARCH)) @@ -55,8 +52,7 @@ Signed-off-by: Fathi Boudra endif -CFLAGS += -D__$(ARCH)__ $(CROSS) --CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS) -+CFLAGS_ARCH += -D$(ARCH) $(CROSS) + CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS) -ifeq ($(ARCH), powerpc64) -CFLAGS += -m64 @@ -78,11 +74,12 @@ Signed-off-by: Fathi Boudra +CFLAGS_COMMON = $(CFLAGS_ARCH) \ + -DVERSION='"$(VERSION)"' \ + -DRELEASE_DATE='"$(DATE)"' ++ + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h - SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c + SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) @@ -97,7 +94,7 @@ Signed-off-by: Fathi Boudra endif ifeq ($(USESNAPPY), on) -@@ -65,12 +66,12 @@ LIBS := -lsnappy $(LIBS) +@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS) ifneq ($(LINKTYPE), dynamic) LIBS := $(LIBS) -lstdc++ endif @@ -112,7 +109,7 @@ Signed-off-by: Fathi Boudra endif ifeq ($(DEBUG), on) -@@ -104,14 +105,14 @@ LIBS := $(LIBS) $(call try-run,\ +@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -126,15 +123,15 @@ Signed-off-by: Fathi Boudra makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) - echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 - grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 - mv temp.8 makedumpfile.8 -@@ -122,7 +123,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( - gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz + @sed -e "s/@DATE@/$(DATE)/" \ + -e "s/@VERSION@/$(VERSION)/" \ + $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8 +@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( + $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5 eppic_makedumpfile.so: extension_eppic.c - $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo clean: - rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz + rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5 diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb similarity index 85% rename from meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb rename to meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb index d4da031866..c3f965b041 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPL-2.0-only" SRCBRANCH ?= "master" -SRCREV = "06ef8e2b814feb08a668b7a3783c86674e49a7b1" +SRCREV = "74bbdd14ec861552ace1ca63953eb2ef73e1f965" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS:${PN}-tools = "perl ${PN}" @@ -52,12 +52,6 @@ do_install () { install -m 755 ${S}/makedumpfile ${D}/usr/bin install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin - mkdir -p ${D}/usr/share/man/man8 - install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 - - mkdir -p ${D}/usr/share/man/man5 - install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 - mkdir -p ${D}/etc/ install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample }