From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686851986; x=1689443986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a/+3Q/hu5iz+UtBONyD6w/mjEv5qAj17STKHkIgAyPc=; b=LwS/AyhEcqhRnDRE3RKSdY9ZKTJ9ob4fCiUGt5oIavS7p61xZ6ASRYFfzyij3i5JYi zFExrBGkPMt8L9bV3NKXfZUSJgaRGG0DtK5FcXeKgOgflpPQGDeEZjaFWHgOtwywiumI tg1zuSNfPZPjxK+I0vEKBNCZpePSmmEA0hqx1fSU1+pmfhmkedspj3AV4CJq2wkY0WWq ubyAqKWZFV+6FkShYCAW2M3KNS/d+3l1dK3Q/5NFbGTeQ7Sn0pvcMUfLaU37Llm/srC4 G6S92gCH06TSCIarGO7f49U+dcDhioapqTlKVdRVOmQENGU+LqEIUflGEQUL7yXDYEkG qRWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686851986; x=1689443986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a/+3Q/hu5iz+UtBONyD6w/mjEv5qAj17STKHkIgAyPc=; b=JYJGDIt4GHnMh85zKHVy4YU9u+VSVEe3Um9hhqmjqDpvWO9PmMKlHuHrq6NPJX6Mhh 0SrfBzTt9747CfzmnGK7mbemWWCcVAB7K7IO6L3CQBNHkBJ0kacpB8kFscumj7vySkq2 HdvMNS2cbbKu35bPbkdqh2TG9rpmY8G2UjUSJmyN8RepcJ6skgZ3ee34QOv40YWgjf9x oGHX+atZeHzX1XcSevwhlVWMAfmZlklKFzMKiOs6Zke1MxlGOdzGUG5j1QUgA8S9KN44 FvKIM4epXHshNRQZQ11B61nP/y291hMEpz6/fp3SYRe9dTXDGMNemcZtelVKXLWq+hOF F/bQ== X-Gm-Message-State: AC+VfDzlaTDf0RxPX5p7LYfPIBnXKSYTP5RUKwKcUzaYUnvaaTG23s7C 5KVpqVWegdsWYfJ0lL9b0M7A7uV9Uyc= X-Google-Smtp-Source: ACHHUZ4SIUcEmX1MVBgwIPL0L4aYVJs3Izf40F4Ji6CqGoIZgHkXXp5xHMYWDPv6D/t30dK3gJ0a+A== X-Received: by 2002:a5d:528e:0:b0:30f:ccca:f482 with SMTP id c14-20020a5d528e000000b0030fcccaf482mr5580876wrv.71.1686851986216; Thu, 15 Jun 2023 10:59:46 -0700 (PDT) From: Alexey Gladkov To: make-initrd@lists.altlinux.org Date: Thu, 15 Jun 2023 19:59:19 +0200 Message-Id: X-Mailer: git-send-email 2.33.8 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [make-initrd] [PATCH v1 10/11] feature/procacct: Make procacct optional X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2023 17:59:49 -0000 Archived-At: List-Archive: Signed-off-by: Alexey Gladkov --- Makefile.in | 10 +++++++ configure.ac | 36 +++++++++++++++++++++++++ features/debug-procacct/src/Makefile.mk | 7 ++--- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 45053fa0..c26a3f44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,8 +90,15 @@ HAVE_LIBINIPARSER := @HAVE_LIBINIPARSER@ HAVE_LIBINIPARSER_LIBS := @HAVE_LIBINIPARSER_LIBS@ HAVE_LIBINIPARSER_CFLAGS := @HAVE_LIBINIPARSER_CFLAGS@ +HAVE_LIBBPF := @HAVE_LIBBPF@ +HAVE_LIBBPF_LIBS := @HAVE_LIBBPF_LIBS@ +HAVE_LIBBPF_CFLAGS := @HAVE_LIBBPF_CFLAGS@ + USE_FEATURE_BOOTLOADER = @USE_FEATURE_BOOTLOADER@ +USE_FEATURE_PROCACCT = @USE_FEATURE_PROCACCT@ +CLANG ?= @CLANG@ +LLVM_STRIP ?= @LLVM_STRIP@ YACC := @YACC@ LEX := @LEX@ @@ -108,6 +115,9 @@ SKIP_FEATURES = ifeq ($(USE_FEATURE_BOOTLOADER),no) SKIP_FEATURES += bootloader endif +ifeq ($(USE_FEATURE_PROCACCT),no) +SKIP_FEATURES += debug-procacct +endif all: build diff --git a/configure.ac b/configure.ac index 9633a2ba..db2575e4 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,41 @@ if test "x$with_feature_bootloader" != xno; then fi fi +AC_ARG_WITH([feature-procacct], + [AS_HELP_STRING([--with-feature-procacct], + [build procacct feature (default: auto)])], + [], + [: m4_divert_text([DEFAULTS], [with_feature_procacct=auto])]) + +USE_FEATURE_PROCACCT=no +HAVE_LIBBPF=no + +if test "x$with_feature_procacct" != xno; then + PKG_CHECK_MODULES(HAVE_LIBBPF, libbpf, [HAVE_LIBBPF=yes], [HAVE_LIBBPF=no]); + AC_PATH_PROGS([with_clang], [clang]) + AC_PATH_PROGS([with_llvm_strip], [llvm-strip]) + + if test "x$with_feature_procacct" != xauto; then + AS_IF([test "x$HAVE_LIBBPF" != xyes], + [AC_MSG_ERROR([libbpf was not found: https://github.com/libbpf/libbpf])]) + AS_IF([! test -x "$with_clang"], + [AC_MSG_ERROR([required utility not found: clang])]) + fi + + if test "x-$HAVE_LIBBPF" = x-yes && test -x "$with_clang"; then + USE_FEATURE_PROCACCT=yes + fi + + if ! test -x "$with_llvm_strip"; then + with_llvm_strip=/bin/true + fi + + AC_SUBST([HAVE_LIBBPF]) + AC_SUBST([CLANG], [$with_clang]) + AC_SUBST([LLVM_STRIP], [$with_llvm_strip]) +fi + + AC_SUBST([HAVE_GZIP]) AC_SUBST([HAVE_BZIP2]) AC_SUBST([HAVE_LZMA]) @@ -326,6 +361,7 @@ AC_SUBST([HAVE_LIBINIPARSER]) AC_SUBST([HAVE_LIBINIPARSER_LIBS]) AC_SUBST([HAVE_LIBINIPARSER_CFLAGS]) AC_SUBST([USE_FEATURE_BOOTLOADER]) +AC_SUBST([USE_FEATURE_PROCACCT]) AC_SUBST([MKLOCAL]) AC_SUBST([YACC]) AC_SUBST([LEX]) diff --git a/features/debug-procacct/src/Makefile.mk b/features/debug-procacct/src/Makefile.mk index 505d8288..43589b1a 100644 --- a/features/debug-procacct/src/Makefile.mk +++ b/features/debug-procacct/src/Makefile.mk @@ -1,16 +1,13 @@ procacct_DEST = $(dest_data_bindir)/procacct procacct_SRCS = $(FEATURESDIR)/debug-procacct/src/procacct.c -procacct_CFLAGS = -D_GNU_SOURCE -Idatasrc/libinitramfs -DPROCACCT_BPF_FILE=\"/bin/procacct-bpf.o\" -procacct_LIBS = -L$(dest_data_libdir) -linitramfs -lbpf +procacct_CFLAGS = -D_GNU_SOURCE -Idatasrc/libinitramfs $(HAVE_LIBBPF_CFLAGS) -DPROCACCT_BPF_FILE=\"/bin/procacct-bpf.o\" +procacct_LIBS = -L$(dest_data_libdir) -linitramfs $(HAVE_LIBBPF_LIBS) PROGS += procacct procacct_bpf_DEST = $(dest_data_bindir)/procacct-bpf.o procacct_bpf_SRCS = $(FEATURESDIR)/debug-procacct/src/procacct-bpf.c -CLANG ?= clang-15 -LLVM_STRIP = llvm-strip - $(dest_data_bindir)/procacct-bpf.o: $(procacct_bpf_SRCS) $(Q)mkdir -p -- $(dir $@) $(call quiet_cmd,BPF,$@,$(CLANG)) -target bpf -g -O2 -Wall -Wextra -o $@ -c $< -- 2.33.8