* IPFire 2.x - Switching to udev from systemd
@ 2023-10-21 17:38 Stefan Schantl
2023-10-21 17:38 ` [PATCH 1/4] python3-MarkupSafe: New package Stefan Schantl
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Stefan Schantl @ 2023-10-21 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1324 bytes --]
Hello devopment folks,
the eudev project got abandoned by the main development team some time ago.
See: https://gitweb.gentoo.org/proj/eudev.git/commit/?id=f559dc96f4105f605272defac9276ef9cb6f5dc6
Currently this old code base works very well on our systems, but we are getting troubles to compile
some newer sort of software with it. The second very important point is
we need a maintainded udev code base again.
Sadly the only remaining udev code base is the officiall one, which got
part of systemd and as a result of the pointed issues above the
following patch series aims to bring a maintained udev back to IPFire.
The first two patches will add some additional packages which are
required by the build system.
The third patch will adjust the LFS file to build udev from the systemd
source code as minimal as possible (all systemd stuff is stripped).
The last patch will adjust the build order of some packages to get udev
and depending packages build.
The new version of udev successfully has been compiled and tested in a
virtual environment (KVM) which worked well.
Because udev is a very critical part of the boot process, this changes
have to be tested very well until we can merge this patchset.
Please help testing and share your feedback.
Best regards,
-Stefan
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] python3-MarkupSafe: New package
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
@ 2023-10-21 17:38 ` Stefan Schantl
2023-10-26 8:58 ` Michael Tremer
2023-10-21 17:38 ` [PATCH 2/4] python3-Jinja2: " Stefan Schantl
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Stefan Schantl @ 2023-10-21 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6129 bytes --]
This is a build dependency for udev (systemd)
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
config/rootfiles/common/python3-MarkupSafe | 16 +++++
lfs/python3-MarkupSafe | 79 ++++++++++++++++++++++
make.sh | 1 +
3 files changed, 96 insertions(+)
create mode 100644 config/rootfiles/common/python3-MarkupSafe
create mode 100644 lfs/python3-MarkupSafe
diff --git a/config/rootfiles/common/python3-MarkupSafe b/config/rootfiles/common/python3-MarkupSafe
new file mode 100644
index 000000000..bbb75f3f8
--- /dev/null
+++ b/config/rootfiles/common/python3-MarkupSafe
@@ -0,0 +1,16 @@
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/native_libs.txt
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/__init__.py
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_native.py
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.c
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.cpython-310-x86_64-linux-gnu.so
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.py
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.pyi
+#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/py.typed
diff --git a/lfs/python3-MarkupSafe b/lfs/python3-MarkupSafe
new file mode 100644
index 000000000..e76d6afca
--- /dev/null
+++ b/lfs/python3-MarkupSafe
@@ -0,0 +1,79 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.1.3
+
+THISAPP = MarkupSafe-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba929be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index e8aae4cf0..e5540c0f4 100755
--- a/make.sh
+++ b/make.sh
@@ -1144,6 +1144,7 @@ buildipfire() {
lfsmake2 sqlite
lfsmake2 python3
lfsmake2 python3-setuptools
+ lfsmake2 python3-MarkupSafe
lfsmake2 ninja
lfsmake2 meson
lfsmake2 glib
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] python3-Jinja2: New package
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
2023-10-21 17:38 ` [PATCH 1/4] python3-MarkupSafe: New package Stefan Schantl
@ 2023-10-21 17:38 ` Stefan Schantl
2023-10-21 17:38 ` [PATCH 3/4] udev: Switch to udev from systemd Stefan Schantl
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Stefan Schantl @ 2023-10-21 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7334 bytes --]
This is a build dependency of udev (systemd)
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
config/rootfiles/common/python3-Jinja2 | 36 ++++++++++++
lfs/python3-Jinja2 | 79 ++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 116 insertions(+)
create mode 100644 config/rootfiles/common/python3-Jinja2
create mode 100644 lfs/python3-Jinja2
diff --git a/config/rootfiles/common/python3-Jinja2 b/config/rootfiles/common/python3-Jinja2
new file mode 100644
index 000000000..755e7bb51
--- /dev/null
+++ b/config/rootfiles/common/python3-Jinja2
@@ -0,0 +1,36 @@
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/entry_points.txt
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/__init__.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/_identifier.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/async_utils.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/bccache.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/compiler.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/constants.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/debug.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/defaults.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/environment.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/exceptions.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/ext.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/filters.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/idtracking.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/lexer.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/loaders.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/meta.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/nativetypes.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/nodes.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/optimizer.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/parser.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/py.typed
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/runtime.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/sandbox.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/tests.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/utils.py
+#usr/lib/python3.10/site-packages/Jinja2-3.1.2-py3.10.egg/jinja2/visitor.py
diff --git a/lfs/python3-Jinja2 b/lfs/python3-Jinja2
new file mode 100644
index 000000000..1c020bec3
--- /dev/null
+++ b/lfs/python3-Jinja2
@@ -0,0 +1,79 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.1.2
+
+THISAPP = Jinja2-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 1b9780cac6e33f4370a5e7d8882d42a640662939c10e355391d9c45119b313e86e37b574551ac44908911feb24b08b537329b98f009c54ad4ed928259fda759f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index e5540c0f4..7380ac7b7 100755
--- a/make.sh
+++ b/make.sh
@@ -1145,6 +1145,7 @@ buildipfire() {
lfsmake2 python3
lfsmake2 python3-setuptools
lfsmake2 python3-MarkupSafe
+ lfsmake2 python3-Jinja2
lfsmake2 ninja
lfsmake2 meson
lfsmake2 glib
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] udev: Switch to udev from systemd
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
2023-10-21 17:38 ` [PATCH 1/4] python3-MarkupSafe: New package Stefan Schantl
2023-10-21 17:38 ` [PATCH 2/4] python3-Jinja2: " Stefan Schantl
@ 2023-10-21 17:38 ` Stefan Schantl
2023-10-21 17:38 ` [PATCH 4/4] make.sh: Adjust build order to proper build udev (systemd) Stefan Schantl
2023-10-26 9:00 ` IPFire 2.x - Switching to udev from systemd Michael Tremer
4 siblings, 0 replies; 9+ messages in thread
From: Stefan Schantl @ 2023-10-21 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8418 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
config/rootfiles/common/udev | 47 +++++++++++++----------
lfs/udev | 72 +++++++++++++++++++++++++-----------
2 files changed, 77 insertions(+), 42 deletions(-)
diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index 876ae0c5a..3eea43718 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -15,6 +15,7 @@ etc/udev/hwdb.d/20-sdio-vendor-model.hwdb
etc/udev/hwdb.d/20-usb-classes.hwdb
etc/udev/hwdb.d/20-usb-vendor-model.hwdb
etc/udev/hwdb.d/20-vmbus-class.hwdb
+etc/udev/hwdb.d/60-autosuspend-chromiumos.hwdb
etc/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
etc/udev/hwdb.d/60-autosuspend.hwdb
etc/udev/hwdb.d/60-evdev.hwdb
@@ -29,38 +30,40 @@ etc/udev/hwdb.d/70-joystick.hwdb
etc/udev/hwdb.d/70-mouse.hwdb
etc/udev/hwdb.d/70-pda.hwdb
etc/udev/hwdb.d/70-pointingstick.hwdb
+etc/udev/hwdb.d/70-sound-card.hwdb
etc/udev/hwdb.d/70-touchpad.hwdb
etc/udev/hwdb.d/80-ieee1394-unit-function.hwdb
+#etc/udev/hwdb.d/README
#etc/udev/rules.d
etc/udev/rules.d/55-lfs.rules
-etc/udev/rules.d/81-cdrom.rules
-etc/udev/rules.d/83-cdrom-symlinks.rules
etc/udev/udev.conf
+#lib/libudev.so
lib/libudev.so.1
-lib/libudev.so.1.6.3
+lib/libudev.so.1.7.7
lib/udev
lib/udev/ata_id
lib/udev/cdrom_id
-lib/udev/collect
lib/udev/dmi_memory_id
lib/udev/fido_id
-lib/udev/init-net-rules.sh
+lib/udev/hwdb.d
+lib/udev/iocost
lib/udev/mtd_probe
lib/udev/network-aqm
lib/udev/network-hotplug-bridges
lib/udev/network-hotplug-rename
lib/udev/network-hotplug-vlan
lib/udev/network-offloading
-lib/udev/rule_generator.functions
#lib/udev/rules.d
lib/udev/rules.d/25-alsa.rules
lib/udev/rules.d/50-udev-default.rules
lib/udev/rules.d/60-autosuspend.rules
lib/udev/rules.d/60-block.rules
lib/udev/rules.d/60-cdrom_id.rules
+lib/udev/rules.d/60-dmi-id.rules
lib/udev/rules.d/60-drm.rules
lib/udev/rules.d/60-evdev.rules
lib/udev/rules.d/60-fido-id.rules
+lib/udev/rules.d/60-infiniband.rules
lib/udev/rules.d/60-input-id.rules
lib/udev/rules.d/60-net.rules
lib/udev/rules.d/60-persistent-alsa.rules
@@ -76,33 +79,37 @@ lib/udev/rules.d/70-camera.rules
lib/udev/rules.d/70-joystick.rules
lib/udev/rules.d/70-memory.rules
lib/udev/rules.d/70-mouse.rules
+lib/udev/rules.d/70-power-switch.rules
lib/udev/rules.d/70-touchpad.rules
+lib/udev/rules.d/70-uaccess.rules
+lib/udev/rules.d/71-seat.rules
+lib/udev/rules.d/73-seat-late.rules
lib/udev/rules.d/75-net-description.rules
lib/udev/rules.d/75-probe_mtd.rules
lib/udev/rules.d/78-sound-card.rules
lib/udev/rules.d/80-drivers.rules
+lib/udev/rules.d/80-net-setup-link.rules
lib/udev/rules.d/81-net-dhcp.rules
+lib/udev/rules.d/90-iocost.rules
lib/udev/rules.d/99-aqm.rules
lib/udev/rules.d/99-offloading.rules
+lib/udev/rules.d/99-systemd.rules
+#lib/udev/rules.d/README
lib/udev/scsi_id
lib/udev/v4l_id
-lib/udev/write_cd_rules
-lib/udev/write_net_rules
sbin/udevadm
sbin/udevd
+usr/bin/udev-hwdb
#usr/include/libudev.h
-#usr/include/udev.h
-#usr/lib/libudev.la
-#usr/lib/libudev.so
#usr/lib/pkgconfig/libudev.pc
-#usr/share/doc/udev-20171102
-#usr/share/doc/udev-20171102/lfs
-#usr/share/doc/udev-20171102/lfs/55-lfs.txt
-#usr/share/doc/udev-20171102/lfs/README
-#usr/share/man/man5/udev.conf.5
-#usr/share/man/man7/hwdb.7
-#usr/share/man/man7/udev.7
-#usr/share/man/man8/udevadm.8
-#usr/share/man/man8/udevd.8
+usr/lib/udev
+usr/lib/udev/init-net-rules.sh
+usr/lib/udev/rule_generator.functions
+usr/lib/udev/rules.d
+usr/lib/udev/write_net_rules
+#usr/share/doc/udev-20230818
+#usr/share/doc/udev-20230818/lfs
+#usr/share/doc/udev-20230818/lfs/55-lfs.txt
+#usr/share/doc/udev-20230818/lfs/README
#usr/share/pkgconfig
#usr/share/pkgconfig/udev.pc
diff --git a/lfs/udev b/lfs/udev
index 3a9c416b5..9ee23d8bd 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,10 +24,10 @@
include Config
-VER = 3.2.14
-RULES_VER = 20171102
+VER = 254
+RULES_VER = 20230818
-THISAPP = eudev-$(VER)
+THISAPP = systemd-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -37,13 +37,13 @@ TARGET = $(DIR_INFO)/$(THISAPP)
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2
+objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2
+udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.xz
-$(DL_FILE)_BLAKE2 = 7d68e77012288ecfac43be31f724224d371cb1084238fe045df248927eff854dbb391ad501e2a36d9b5ea4eb0a8cba3f9f21ea668908584a24c2a65df93ffdf8
-udev-lfs-$(RULES_VER).tar.bz2_BLAKE2 = b5fb8177a87719e28adc976b83953024dbcfb8739b0c2e61da186cbc4df5e75e62c888da987d15c64db164002bb0a1e66ce0ff206b143dc953d7571b66d5d5c0
+$(DL_FILE)_BLAKE2 = 4703ac102dd0003a2ef59dfd9b6fc6345b57cf1ff6397ebc71b3e9abb35ad5b891d114038a91eddba25b4ec81b8208a36691bc5490173b223ba35842cd1776d4
+udev-lfs-$(RULES_VER).tar.xz_BLAKE2 = e8c20bdddb5191381bad11bf46b0d605ce952afb697e8bf3e80b216c64eacbb327d0d961c5a1f49291576c82452e8472bb62f31f8bacc81eb832aa746a5234d4
install : $(TARGET)
@@ -73,24 +73,52 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2
- cd $(DIR_APP) && ./configure \
+ cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.xz
+
+ # Remove two unneeded groups (render and sgx) from the default udev rules
+ cd $(DIR_APP) && sed -i -e 's/GROUP="render"/GROUP="video"/' \
+ -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in
+
+ # Remve udev rule which requires a full systemd installation
+ cd $(DIR_APP) && sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in
+
+ # Prepare udev for build.
+ cd $(DIR_APP) && mkdir -pv build
+ cd $(DIR_APP)/build && meson setup \
--prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --sysconfdir=/etc \
- --libdir=/usr/lib \
- --libexecdir=/lib \
- --with-rootprefix= \
- --with-rootlibdir=/lib \
- --enable-manpages \
- --disable-static
-
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
+ --buildtype=release \
+ -Dmode=release \
+ -Ddev-kvm-mode=0660 \
+ -Dlink-udev-shared=false \
+ ..
+
+ # Only build udev and required components
+ cd $(DIR_APP)/build && ninja udevadm systemd-hwdb \
+ $$(grep -o -E "^build (src/libudev|src/udev|rules.d|hwdb.d)[^:]*" \
+ build.ninja | awk '{ print $$2 }') \
+ $$(realpath libudev.so --relative-to .)
+
+ # Drop udev rules which requires a full systemd installation
+ cd $(DIR_APP)/build && rm -vf rules.d/90-vconsole.rules
+
+ # Install udev
+ cd $(DIR_APP)/build && install -vm755 -d {/lib,/etc}/udev/{hwdb,rules}.d
+ cd $(DIR_APP)/build && install -vm755 -d /usr/{lib,share}/pkgconfig
+ cd $(DIR_APP)/build && install -vm755 udevadm /bin/
+ cd $(DIR_APP)/build && install -vm755 systemd-hwdb /usr/bin/udev-hwdb
+ cd $(DIR_APP)/build && ln -svfn ../bin/udevadm /sbin/udevd
+ cd $(DIR_APP)/build && ln -svfn ../bin/udevadm /sbin/udevadm
+ cd $(DIR_APP)/build && cp -av libudev.so{,*[0-9]} /lib/
+ cd $(DIR_APP)/build && install -vm644 ../src/libudev/libudev.h /usr/include/
+ cd $(DIR_APP)/build && install -vm644 src/libudev/*.pc /usr/lib/pkgconfig/
+ cd $(DIR_APP)/build && install -vm644 src/udev/*.pc /usr/share/pkgconfig/
+ cd $(DIR_APP)/build && install -vm644 ../src/udev/udev.conf /etc/udev/
+ cd $(DIR_APP)/build && install -vm644 rules.d/* ../rules.d/{*.rules,README} /lib/udev/rules.d/
+ cd $(DIR_APP)/build && install -vm644 hwdb.d/* ../hwdb.d/{*.hwdb,README} /etc/udev/hwdb.d/
+ cd $(DIR_APP)/build && install -vm755 $$(find src/udev -type f | grep -F -v ".") /lib/udev
# Generate hardware database
- udevadm hwdb --update
+ udev-hwdb update
# Install rules
cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] make.sh: Adjust build order to proper build udev (systemd)
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
` (2 preceding siblings ...)
2023-10-21 17:38 ` [PATCH 3/4] udev: Switch to udev from systemd Stefan Schantl
@ 2023-10-21 17:38 ` Stefan Schantl
2023-10-26 9:00 ` IPFire 2.x - Switching to udev from systemd Michael Tremer
4 siblings, 0 replies; 9+ messages in thread
From: Stefan Schantl @ 2023-10-21 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
make.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/make.sh b/make.sh
index 7380ac7b7..fce5024a5 100755
--- a/make.sh
+++ b/make.sh
@@ -1103,11 +1103,11 @@ buildipfire() {
lfsmake2 backup
lfsmake2 rust
lfsmake2 openssl
- lfsmake2 kmod
- lfsmake2 udev
lfsmake2 popt
lfsmake2 libedit
- lfsmake2 libusb
+ lfsmake2 pam
+ lfsmake2 libcap
+ lfsmake2 libcap-ng
lfsmake2 libpcap
lfsmake2 ppp
lfsmake2 pptp
@@ -1116,11 +1116,7 @@ buildipfire() {
lfsmake2 bc
lfsmake2 u-boot MKIMAGE=1
lfsmake2 cpio
- lfsmake2 mdadm
- lfsmake2 dracut
lfsmake2 libaio
- lfsmake2 lvm2
- lfsmake2 multipath-tools
lfsmake2 freetype
lfsmake2 libmnl
lfsmake2 libnfnetlink
@@ -1148,6 +1144,13 @@ buildipfire() {
lfsmake2 python3-Jinja2
lfsmake2 ninja
lfsmake2 meson
+ lfsmake2 kmod
+ lfsmake2 udev
+ lfsmake2 libusb
+ lfsmake2 mdadm
+ lfsmake2 dracut
+ lfsmake2 lvm2
+ lfsmake2 multipath-tools
lfsmake2 glib
lfsmake2 libgudev
lfsmake2 libgpg-error
@@ -1167,7 +1170,6 @@ buildipfire() {
lfsmake2 boost
lfsmake2 linux-atm
lfsmake2 libqmi
- lfsmake2 pam
lfsmake2 c-ares
lfsmake2 rust-dissimilar
lfsmake2 rust-cfg-if
@@ -1293,8 +1295,6 @@ buildipfire() {
lfsmake2 slang
lfsmake2 newt
lfsmake2 libsmooth
- lfsmake2 libcap
- lfsmake2 libcap-ng
lfsmake2 pciutils
lfsmake2 usbutils
lfsmake2 libxml2
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] python3-MarkupSafe: New package
2023-10-21 17:38 ` [PATCH 1/4] python3-MarkupSafe: New package Stefan Schantl
@ 2023-10-26 8:58 ` Michael Tremer
2023-10-29 18:21 ` Stefan Schantl
0 siblings, 1 reply; 9+ messages in thread
From: Michael Tremer @ 2023-10-26 8:58 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6591 bytes --]
Hello,
This patch has the architecture name in the file list.
Could you please send a fix for this?
-Michael
> On 21 Oct 2023, at 18:38, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>
> This is a build dependency for udev (systemd)
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> config/rootfiles/common/python3-MarkupSafe | 16 +++++
> lfs/python3-MarkupSafe | 79 ++++++++++++++++++++++
> make.sh | 1 +
> 3 files changed, 96 insertions(+)
> create mode 100644 config/rootfiles/common/python3-MarkupSafe
> create mode 100644 lfs/python3-MarkupSafe
>
> diff --git a/config/rootfiles/common/python3-MarkupSafe b/config/rootfiles/common/python3-MarkupSafe
> new file mode 100644
> index 000000000..bbb75f3f8
> --- /dev/null
> +++ b/config/rootfiles/common/python3-MarkupSafe
> @@ -0,0 +1,16 @@
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/PKG-INFO
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/SOURCES.txt
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/dependency_links.txt
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/native_libs.txt
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/not-zip-safe
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/EGG-INFO/top_level.txt
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/__init__.py
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_native.py
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.c
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.cpython-310-x86_64-linux-gnu.so
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.py
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/_speedups.pyi
> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-x86_64.egg/markupsafe/py.typed
> diff --git a/lfs/python3-MarkupSafe b/lfs/python3-MarkupSafe
> new file mode 100644
> index 000000000..e76d6afca
> --- /dev/null
> +++ b/lfs/python3-MarkupSafe
> @@ -0,0 +1,79 @@
> +###############################################################################
> +# #
> +# IPFire.org - A linux based firewall #
> +# Copyright (C) 2007-2018 IPFire Team <info(a)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 #
> +# the Free Software Foundation, either version 3 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# This program is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> +# GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with this program. If not, see <http://www.gnu.org/licenses/>. #
> +# #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER = 2.1.3
> +
> +THISAPP = MarkupSafe-$(VER)
> +DL_FILE = $(THISAPP).tar.gz
> +DL_FROM = $(URL_IPFIRE)
> +DIR_APP = $(DIR_SRC)/$(THISAPP)
> +TARGET = $(DIR_INFO)/$(THISAPP)
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 = 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba929be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +b2 : $(subst %,%_BLAKE2,$(objects))
> +
> +dist:
> + @$(PAK)
> +
> +###############################################################################
> +# Downloading, checking, b2sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> + @$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> + @$(LOAD)
> +
> +$(subst %,%_BLAKE2,$(objects)) :
> + @$(B2SUM)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> + @$(PREBUILD)
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && python3 setup.py build
> + cd $(DIR_APP) && python3 setup.py install
> + @rm -rf $(DIR_APP)
> + @$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index e8aae4cf0..e5540c0f4 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1144,6 +1144,7 @@ buildipfire() {
> lfsmake2 sqlite
> lfsmake2 python3
> lfsmake2 python3-setuptools
> + lfsmake2 python3-MarkupSafe
> lfsmake2 ninja
> lfsmake2 meson
> lfsmake2 glib
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: IPFire 2.x - Switching to udev from systemd
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
` (3 preceding siblings ...)
2023-10-21 17:38 ` [PATCH 4/4] make.sh: Adjust build order to proper build udev (systemd) Stefan Schantl
@ 2023-10-26 9:00 ` Michael Tremer
4 siblings, 0 replies; 9+ messages in thread
From: Michael Tremer @ 2023-10-26 9:00 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1903 bytes --]
Hello Stefan,
Thank you for working on this so swiftly.
I would like to merge this into Core Update 181, because I feel quite confident about this.
There should not be any major differences between the former eudev and this version, so let’s be brave and roll it out quickly.
Please see my comment on a required change on one of the patches. Otherwise I feel that this is good to be merged.
-Michael
> On 21 Oct 2023, at 18:38, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>
> Hello devopment folks,
>
> the eudev project got abandoned by the main development team some time ago.
>
> See: https://gitweb.gentoo.org/proj/eudev.git/commit/?id=f559dc96f4105f605272defac9276ef9cb6f5dc6
>
> Currently this old code base works very well on our systems, but we are getting troubles to compile
> some newer sort of software with it. The second very important point is
> we need a maintainded udev code base again.
>
> Sadly the only remaining udev code base is the officiall one, which got
> part of systemd and as a result of the pointed issues above the
> following patch series aims to bring a maintained udev back to IPFire.
>
> The first two patches will add some additional packages which are
> required by the build system.
>
> The third patch will adjust the LFS file to build udev from the systemd
> source code as minimal as possible (all systemd stuff is stripped).
>
> The last patch will adjust the build order of some packages to get udev
> and depending packages build.
>
> The new version of udev successfully has been compiled and tested in a
> virtual environment (KVM) which worked well.
>
> Because udev is a very critical part of the boot process, this changes
> have to be tested very well until we can merge this patchset.
>
> Please help testing and share your feedback.
>
> Best regards,
>
> -Stefan
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] python3-MarkupSafe: New package
2023-10-26 8:58 ` Michael Tremer
@ 2023-10-29 18:21 ` Stefan Schantl
2023-10-30 10:00 ` Michael Tremer
0 siblings, 1 reply; 9+ messages in thread
From: Stefan Schantl @ 2023-10-29 18:21 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7964 bytes --]
Hello Michael,
thanks for pointing this out.
I've sent a new patchset to the mailing list.
Best regards,
-Stefan
> Hello,
>
> This patch has the architecture name in the file list.
>
> Could you please send a fix for this?
>
> -Michael
>
> > On 21 Oct 2023, at 18:38, Stefan Schantl
> > <stefan.schantl(a)ipfire.org> wrote:
> >
> > This is a build dependency for udev (systemd)
> >
> > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > ---
> > config/rootfiles/common/python3-MarkupSafe | 16 +++++
> > lfs/python3-MarkupSafe | 79
> > ++++++++++++++++++++++
> > make.sh | 1 +
> > 3 files changed, 96 insertions(+)
> > create mode 100644 config/rootfiles/common/python3-MarkupSafe
> > create mode 100644 lfs/python3-MarkupSafe
> >
> > diff --git a/config/rootfiles/common/python3-MarkupSafe
> > b/config/rootfiles/common/python3-MarkupSafe
> > new file mode 100644
> > index 000000000..bbb75f3f8
> > --- /dev/null
> > +++ b/config/rootfiles/common/python3-MarkupSafe
> > @@ -0,0 +1,16 @@
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/PKG-INFO
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/SOURCES.txt
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/dependency_links.txt
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/native_libs.txt
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/not-zip-safe
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/EGG-INFO/top_level.txt
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/__init__.py
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/_native.py
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/_speedups.c
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/_speedups.cpython-310-x86_64-linux-gnu.so
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/_speedups.py
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/_speedups.pyi
> > +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
> > x86_64.egg/markupsafe/py.typed
> > diff --git a/lfs/python3-MarkupSafe b/lfs/python3-MarkupSafe
> > new file mode 100644
> > index 000000000..e76d6afca
> > --- /dev/null
> > +++ b/lfs/python3-MarkupSafe
> > @@ -0,0 +1,79 @@
> > +##################################################################
> > #############
> > +#
> > #
> > +# IPFire.org - A linux based
> > firewall #
> > +# Copyright (C) 2007-2018 IPFire Team
> > <info(a)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 #
> > +# the Free Software Foundation, either version 3 of the License,
> > or #
> > +# (at your option) any later
> > version. #
> > +#
> > #
> > +# This program is distributed in the hope that it will be
> > useful, #
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty
> > of #
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> > the #
> > +# GNU General Public License for more
> > details. #
> > +#
> > #
> > +# You should have received a copy of the GNU General Public
> > License #
> > +# along with this program. If not, see
> > <http://www.gnu.org/licenses/>. #
> > +#
> > #
> > +##################################################################
> > #############
> > +
> > +##################################################################
> > #############
> > +# Definitions
> > +##################################################################
> > #############
> > +
> > +include Config
> > +
> > +VER = 2.1.3
> > +
> > +THISAPP = MarkupSafe-$(VER)
> > +DL_FILE = $(THISAPP).tar.gz
> > +DL_FROM = $(URL_IPFIRE)
> > +DIR_APP = $(DIR_SRC)/$(THISAPP)
> > +TARGET = $(DIR_INFO)/$(THISAPP)
> > +
> > +##################################################################
> > #############
> > +# Top-level Rules
> > +##################################################################
> > #############
> > +
> > +objects = $(DL_FILE)
> > +
> > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > +
> > +$(DL_FILE)_BLAKE2 =
> > 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba9
> > 29be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783
> > +
> > +install : $(TARGET)
> > +
> > +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> > +
> > +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> > +
> > +b2 : $(subst %,%_BLAKE2,$(objects))
> > +
> > +dist:
> > + @$(PAK)
> > +
> > +##################################################################
> > #############
> > +# Downloading, checking, b2sum
> > +##################################################################
> > #############
> > +
> > +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> > + @$(CHECK)
> > +
> > +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> > + @$(LOAD)
> > +
> > +$(subst %,%_BLAKE2,$(objects)) :
> > + @$(B2SUM)
> > +
> > +##################################################################
> > #############
> > +# Installation Details
> > +##################################################################
> > #############
> > +
> > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > + @$(PREBUILD)
> > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
> > $(DIR_DL)/$(DL_FILE)
> > + cd $(DIR_APP) && python3 setup.py build
> > + cd $(DIR_APP) && python3 setup.py install
> > + @rm -rf $(DIR_APP)
> > + @$(POSTBUILD)
> > diff --git a/make.sh b/make.sh
> > index e8aae4cf0..e5540c0f4 100755
> > --- a/make.sh
> > +++ b/make.sh
> > @@ -1144,6 +1144,7 @@ buildipfire() {
> > lfsmake2 sqlite
> > lfsmake2 python3
> > lfsmake2 python3-setuptools
> > + lfsmake2 python3-MarkupSafe
> > lfsmake2 ninja
> > lfsmake2 meson
> > lfsmake2 glib
> > --
> > 2.39.2
> >
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] python3-MarkupSafe: New package
2023-10-29 18:21 ` Stefan Schantl
@ 2023-10-30 10:00 ` Michael Tremer
0 siblings, 0 replies; 9+ messages in thread
From: Michael Tremer @ 2023-10-30 10:00 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7527 bytes --]
Thank you.
I merged this and pushed it straight into next.
Everyone, please give this a good test.
Best,
-Michael
> On 29 Oct 2023, at 18:21, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>
> Hello Michael,
>
> thanks for pointing this out.
>
> I've sent a new patchset to the mailing list.
>
> Best regards,
>
> -Stefan
>> Hello,
>>
>> This patch has the architecture name in the file list.
>>
>> Could you please send a fix for this?
>>
>> -Michael
>>
>>> On 21 Oct 2023, at 18:38, Stefan Schantl
>>> <stefan.schantl(a)ipfire.org> wrote:
>>>
>>> This is a build dependency for udev (systemd)
>>>
>>> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/python3-MarkupSafe | 16 +++++
>>> lfs/python3-MarkupSafe | 79
>>> ++++++++++++++++++++++
>>> make.sh | 1 +
>>> 3 files changed, 96 insertions(+)
>>> create mode 100644 config/rootfiles/common/python3-MarkupSafe
>>> create mode 100644 lfs/python3-MarkupSafe
>>>
>>> diff --git a/config/rootfiles/common/python3-MarkupSafe
>>> b/config/rootfiles/common/python3-MarkupSafe
>>> new file mode 100644
>>> index 000000000..bbb75f3f8
>>> --- /dev/null
>>> +++ b/config/rootfiles/common/python3-MarkupSafe
>>> @@ -0,0 +1,16 @@
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/PKG-INFO
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/SOURCES.txt
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/dependency_links.txt
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/native_libs.txt
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/not-zip-safe
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/EGG-INFO/top_level.txt
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/__init__.py
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/_native.py
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/_speedups.c
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/_speedups.cpython-310-x86_64-linux-gnu.so
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/_speedups.py
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/_speedups.pyi
>>> +#usr/lib/python3.10/site-packages/MarkupSafe-2.1.3-py3.10-linux-
>>> x86_64.egg/markupsafe/py.typed
>>> diff --git a/lfs/python3-MarkupSafe b/lfs/python3-MarkupSafe
>>> new file mode 100644
>>> index 000000000..e76d6afca
>>> --- /dev/null
>>> +++ b/lfs/python3-MarkupSafe
>>> @@ -0,0 +1,79 @@
>>> +##################################################################
>>> #############
>>> +#
>>> #
>>> +# IPFire.org - A linux based
>>> firewall #
>>> +# Copyright (C) 2007-2018 IPFire Team
>>> <info(a)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 #
>>> +# the Free Software Foundation, either version 3 of the License,
>>> or #
>>> +# (at your option) any later
>>> version. #
>>> +#
>>> #
>>> +# This program is distributed in the hope that it will be
>>> useful, #
>>> +# but WITHOUT ANY WARRANTY; without even the implied warranty
>>> of #
>>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
>>> the #
>>> +# GNU General Public License for more
>>> details. #
>>> +#
>>> #
>>> +# You should have received a copy of the GNU General Public
>>> License #
>>> +# along with this program. If not, see
>>> <http://www.gnu.org/licenses/>. #
>>> +#
>>> #
>>> +##################################################################
>>> #############
>>> +
>>> +##################################################################
>>> #############
>>> +# Definitions
>>> +##################################################################
>>> #############
>>> +
>>> +include Config
>>> +
>>> +VER = 2.1.3
>>> +
>>> +THISAPP = MarkupSafe-$(VER)
>>> +DL_FILE = $(THISAPP).tar.gz
>>> +DL_FROM = $(URL_IPFIRE)
>>> +DIR_APP = $(DIR_SRC)/$(THISAPP)
>>> +TARGET = $(DIR_INFO)/$(THISAPP)
>>> +
>>> +##################################################################
>>> #############
>>> +# Top-level Rules
>>> +##################################################################
>>> #############
>>> +
>>> +objects = $(DL_FILE)
>>> +
>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> +
>>> +$(DL_FILE)_BLAKE2 =
>>> 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba9
>>> 29be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783
>>> +
>>> +install : $(TARGET)
>>> +
>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
>>> +
>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>> +
>>> +b2 : $(subst %,%_BLAKE2,$(objects))
>>> +
>>> +dist:
>>> + @$(PAK)
>>> +
>>> +##################################################################
>>> #############
>>> +# Downloading, checking, b2sum
>>> +##################################################################
>>> #############
>>> +
>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
>>> + @$(CHECK)
>>> +
>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
>>> + @$(LOAD)
>>> +
>>> +$(subst %,%_BLAKE2,$(objects)) :
>>> + @$(B2SUM)
>>> +
>>> +##################################################################
>>> #############
>>> +# Installation Details
>>> +##################################################################
>>> #############
>>> +
>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> + @$(PREBUILD)
>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
>>> $(DIR_DL)/$(DL_FILE)
>>> + cd $(DIR_APP) && python3 setup.py build
>>> + cd $(DIR_APP) && python3 setup.py install
>>> + @rm -rf $(DIR_APP)
>>> + @$(POSTBUILD)
>>> diff --git a/make.sh b/make.sh
>>> index e8aae4cf0..e5540c0f4 100755
>>> --- a/make.sh
>>> +++ b/make.sh
>>> @@ -1144,6 +1144,7 @@ buildipfire() {
>>> lfsmake2 sqlite
>>> lfsmake2 python3
>>> lfsmake2 python3-setuptools
>>> + lfsmake2 python3-MarkupSafe
>>> lfsmake2 ninja
>>> lfsmake2 meson
>>> lfsmake2 glib
>>> --
>>> 2.39.2
>>>
>>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-10-30 10:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-21 17:38 IPFire 2.x - Switching to udev from systemd Stefan Schantl
2023-10-21 17:38 ` [PATCH 1/4] python3-MarkupSafe: New package Stefan Schantl
2023-10-26 8:58 ` Michael Tremer
2023-10-29 18:21 ` Stefan Schantl
2023-10-30 10:00 ` Michael Tremer
2023-10-21 17:38 ` [PATCH 2/4] python3-Jinja2: " Stefan Schantl
2023-10-21 17:38 ` [PATCH 3/4] udev: Switch to udev from systemd Stefan Schantl
2023-10-21 17:38 ` [PATCH 4/4] make.sh: Adjust build order to proper build udev (systemd) Stefan Schantl
2023-10-26 9:00 ` IPFire 2.x - Switching to udev from systemd Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox