* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d44861b745972143d0ec5b83f0f71a221f17e074
@ 2025-10-30 14:50 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-10-30 14:50 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via d44861b745972143d0ec5b83f0f71a221f17e074 (commit)
via d7757bf7731086403a31c59648a3603490a64758 (commit)
via 581c9df1b4bda8ec154db78c9b99e988f46be033 (commit)
via f3c2b8a0afd6b488a6655592a9d9908618c7f1d4 (commit)
via 845623b97b1230c825c23dd1788a81adef88f6e2 (commit)
from 9461fe41f668a0c0b80dd8c8b5e53bf7fd623c73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d44861b745972143d0ec5b83f0f71a221f17e074
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Oct 30 14:48:20 2025 +0000
make.sh: Build expect a lot earlier
That way, we will have a good chance that the same tools are available
during the state2 build as there in the toolchain stage.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit d7757bf7731086403a31c59648a3603490a64758
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Oct 30 11:18:30 2025 +0100
core199: Ship expect and tcl
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 581c9df1b4bda8ec154db78c9b99e988f46be033
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Oct 30 11:18:29 2025 +0100
tcl: install private headers for expect to use in build
- expect looks for both the public and private headers so make install-private-headers
added into lfs.
- Update of rootfile
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit f3c2b8a0afd6b488a6655592a9d9908618c7f1d4
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Oct 30 11:18:28 2025 +0100
make.sh: Add expect into the lfsmake2 list
- With expect available in the main build section the hack of having --enable-toolchain
used for it is no longer needed.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 845623b97b1230c825c23dd1788a81adef88f6e2
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Oct 30 11:18:27 2025 +0100
expect: Allow build of expect for swtpm
- 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 <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/expect | 21 ++++++++++++++
config/rootfiles/common/tcl | 7 +++++
config/rootfiles/core/199/filelists/expect | 1 +
.../{oldcore/155 => core/199}/filelists/tcl | 0
lfs/expect | 32 ++++++++++++++++------
lfs/tcl | 2 +-
make.sh | 3 +-
7 files changed, 55 insertions(+), 11 deletions(-)
create mode 100644 config/rootfiles/common/expect
create mode 120000 config/rootfiles/core/199/filelists/expect
copy config/rootfiles/{oldcore/155 => core/199}/filelists/tcl (100%)
Difference in files:
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/config/rootfiles/common/tcl b/config/rootfiles/common/tcl
index e01d7cfa2..e64e428c1 100644
--- a/config/rootfiles/common/tcl
+++ b/config/rootfiles/common/tcl
@@ -16,12 +16,19 @@ usr/bin/tclsh8.6
#usr/include/pqStubs.h
#usr/include/tcl.h
#usr/include/tclDecls.h
+#usr/include/tclInt.h
+#usr/include/tclIntDecls.h
+#usr/include/tclIntPlatDecls.h
#usr/include/tclOO.h
#usr/include/tclOODecls.h
+#usr/include/tclOOInt.h
+#usr/include/tclOOIntDecls.h
#usr/include/tclPlatDecls.h
+#usr/include/tclPort.h
#usr/include/tclThread.h
#usr/include/tclTomMath.h
#usr/include/tclTomMathDecls.h
+#usr/include/tclUnixPort.h
#usr/include/tdbc.h
#usr/include/tdbcDecls.h
#usr/include/tdbcInt.h
diff --git a/config/rootfiles/core/199/filelists/expect b/config/rootfiles/core/199/filelists/expect
new file mode 120000
index 000000000..77f2f49ee
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/expect
@@ -0,0 +1 @@
+../../../common/expect
\ No newline at end of file
diff --git a/config/rootfiles/core/199/filelists/tcl b/config/rootfiles/core/199/filelists/tcl
new file mode 120000
index 000000000..7f620c687
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/tcl
@@ -0,0 +1 @@
+../../../common/tcl
\ No newline at end of file
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 <info@ipfire.org> #
+# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
# #
# 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*
diff --git a/lfs/tcl b/lfs/tcl
index b02f11ac0..1cf940ed2 100644
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -80,8 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX)
cd $(DIR_APP)/unix && make $(MAKETUNING)
cd $(DIR_APP)/unix && make install
-ifneq "$(ROOT)" ""
cd $(DIR_APP)/unix && make install-private-headers
+ifneq "$(ROOT)" ""
ln -sf tclsh8.6 $(TOOLS_DIR)/bin/tclsh
else
ln -sf tclsh8.6 /usr/bin/tclsh
diff --git a/make.sh b/make.sh
index 5bdc7690c..b17e90e13 100755
--- a/make.sh
+++ b/make.sh
@@ -1559,6 +1559,7 @@ build_system() {
lfsmake2 cmake
lfsmake2 json-c
lfsmake2 tcl
+ lfsmake2 expect
lfsmake2 python3-MarkupSafe
lfsmake2 python3-Jinja2
lfsmake2 kmod
@@ -2067,7 +2068,7 @@ build_system() {
lfsmake2 mcelog
lfsmake2 socat
lfsmake2 libtpms
- lfsmake2 --enable-toolchain swtpm # requires expect from the toolchain
+ lfsmake2 swtpm
lfsmake2 libpciaccess
lfsmake2 ovmf
lfsmake2 libvirt
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-10-30 14:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-30 14:50 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d44861b745972143d0ec5b83f0f71a221f17e074 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox