From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cy0Sb5y7Xz332T for ; Thu, 30 Oct 2025 10:18:39 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cy0SX367wz2xQW for ; Thu, 30 Oct 2025 10:18:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cy0SW4wV2z1Mn; Thu, 30 Oct 2025 10:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1761819515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jZVsk5ZVGPCHZIH0KRRdDFuVF24rTVotffhp1atnuQc=; b=KfLu3pZpXx9tDzCXnGn14X5rHzPPI9FetIaZVXmPSyNxnrYBpfW1pLW4hlc9llOP7EFWOI mytvqMRjoUz5AENSW5z21UnA6js5Sb6idLUwCkre+Bz/mj05cdjOQrJwCBWp0EPEsjGIYC xRj4Sn2zzBxC9rahE68PtJbIVo11gksxmpI5VV4PtUFoS2CG9KPH/hq7sWg+RgtYKrl+9Q XbJNSuRsT0jishYTODjNKu8RIPNTu4T3RVcVgKk/t0mV8bNSh61wrpsXuh5Damp/cDXcqm GhrgJMfpY95oo0FDbQq5lVC+hewWXM5lziWCuTW/DTsaWTuJ6pI+7N+r3CkkMw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1761819515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jZVsk5ZVGPCHZIH0KRRdDFuVF24rTVotffhp1atnuQc=; b=I7C0/wzSJ1Ql+DMAMb2uy7NHmOT0Rtx5LdxXff9UwKJu/wex3L9UiJ5OspMrPrwES+Mvcl kZMXgHzPEBvvMuBQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/4] expect: Allow build of expect for swtpm Date: Thu, 30 Oct 2025 11:18:27 +0100 Message-ID: <20251030101830.30837-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - expect was previously only built in the toolchain. This allows expect to be built for swtpm in the normal build. - It is only used for the building of swtpm so the rootfile has all entries commented out. - LFS changed to allow build in the toolchain or in the normal build Signed-off-by: Adolf Belka --- config/rootfiles/common/expect | 21 +++++++++++++++++++++ lfs/expect | 32 +++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 config/rootfiles/common/expect diff --git a/config/rootfiles/common/expect b/config/rootfiles/common/expect new file mode 100644 index 000000000..a11c3add3 --- /dev/null +++ b/config/rootfiles/common/expect @@ -0,0 +1,21 @@ +#usr/bin/expect +#usr/include/expect.h +#usr/include/expect_comm.h +#usr/include/expect_tcl.h +#usr/include/tcldbg.h +#usr/lib/expect5.45.4 +#usr/lib/expect5.45.4/libexpect5.45.4.so +#usr/lib/expect5.45.4/pkgIndex.tcl +#usr/share/man/man1/autoexpect.1 +#usr/share/man/man1/cryptdir.1 +#usr/share/man/man1/decryptdir.1 +#usr/share/man/man1/dislocate.1 +#usr/share/man/man1/expect.1 +#usr/share/man/man1/kibitz.1 +#usr/share/man/man1/mkpasswd.1 +#usr/share/man/man1/multixterm.1 +#usr/share/man/man1/passmass.1 +#usr/share/man/man1/tknewsbiff.1 +#usr/share/man/man1/unbuffer.1 +#usr/share/man/man1/xkibitz.1 +#usr/share/man/man3/libexpect.3 diff --git a/lfs/expect b/lfs/expect index e5638f9f5..9e233be3e 100644 --- a/lfs/expect +++ b/lfs/expect @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -30,7 +30,27 @@ THISAPP = expect$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-tools +TARGET = $(DIR_INFO)/$(THISAPP) + +# Normal build or $(TOOLS_DIR) build. +ifeq "$(ROOT)" "" + TARGET = $(DIR_INFO)/$(THISAPP) + EXTRA_CONFIG = \ + --prefix=/usr \ + --with-tcl=/usr/lib \ + --with-tclinclude=/usr/include \ + --with-x=no \ + --disable-nls +else + TARGET = $(DIR_INFO)/$(THISAPP)-tools + EXTRA_CONFIG = \ + --prefix=$(TOOLS_DIR) \ + --build=$(BUILDTARGET) \ + --with-tcl=$(TOOLS_DIR)/lib \ + --with-tclinclude=$(TOOLS_DIR)/include \ + --with-x=no \ + --disable-nls +endif # Fix build with GCC 15 CFLAGS += -std=gnu17 @@ -75,13 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/expect-5.45.4-gcc15-1.patch - cd $(DIR_APP) && ./configure \ - --prefix=$(TOOLS_DIR) \ - --build=$(BUILDTARGET) \ - --with-tcl=$(TOOLS_DIR)/lib \ - --with-tclinclude=$(TOOLS_DIR)/include \ - --with-x=no \ - --disable-nls + cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make SCRIPTS="" install @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* -- 2.51.1