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 2c474411a50060a166b0d79fc54defb8fcc855e2 (commit) via 172b0aed90ee6e51e7009cd79e43becf860b071a (commit) via 0d774f0db56882073254973bd25da32c50f12801 (commit) via ca81c65144e64a54937a00bf79f7a51e80bc6d97 (commit) via f2fce26932d86ac6e15ec33d58ae432958411410 (commit) from 6504ab1d36ff9fa4fc2a90136150d477ee039b30 (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 2c474411a50060a166b0d79fc54defb8fcc855e2 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Dec 13 20:00:34 2024 +0100
libcap: Update to version 2.73
- Update from version 2.72 to 2.73 - Update of rootfile - This version builds correctly with aarch64 - tested out building on the aarch64-builder system - Changelog 2.73 Bug fixes for libpsx changes in the 2.72 release. Some architectures do not support the system call getdents(). More modern architectures only support getdents64(), so use that. Patch provided by Xi Ruoyao. gettid() isn't consistently defined in all *libc's so create a macro for using it in the libpsx sources. Fix some static analysis found issues, surfaced by Carlos Rodriguez-Fernandez from an analysis performed on Fedora's libcap-2.71 release. Third attempt to get an executable cap package runnable example into the documentation on go.pkg.dev. It still isn't working, but I think the issue is now one for the go.dev website: Filed go/issues/70630 which got duped into this go/issues/70611 and a fix was requested by Ian Taylor. Remove a redundant c.String() function since fmt.Println(c) can figure this detail out. Freshen up setcap.c sources. Sort the argument help. Add go vet to the tests for cap and psx packages.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 172b0aed90ee6e51e7009cd79e43becf860b071a Merge: 6504ab1d36 0d774f0db5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 14 12:07:19 2024 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/libcap | 4 ++-- lfs/Config | 6 +++--- lfs/flash-images | 2 +- lfs/libcap | 4 ++-- src/initscripts/system/partresize | 13 ------------- src/installer/hw.c | 5 ----- src/installer/hw.h | 7 +++---- src/installer/main.c | 1 - 8 files changed, 11 insertions(+), 31 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap index 82754304e..dc411f3e5 100644 --- a/config/rootfiles/common/libcap +++ b/config/rootfiles/common/libcap @@ -6,10 +6,10 @@ sbin/setcap #usr/include/sys/psx_syscall.h #usr/lib/libcap.so usr/lib/libcap.so.2 -usr/lib/libcap.so.2.72 +usr/lib/libcap.so.2.73 #usr/lib/libpsx.so #usr/lib/libpsx.so.2 -usr/lib/libpsx.so.2.72 +usr/lib/libpsx.so.2.73 #usr/lib/pkgconfig/libcap.pc #usr/lib/pkgconfig/libpsx.pc #usr/lib/security diff --git a/lfs/Config b/lfs/Config index 1a59ebe1e..8547f69c6 100644 --- a/lfs/Config +++ b/lfs/Config @@ -292,13 +292,13 @@ define POSTBUILD fi; \ sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/xxxMACHINExxx/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \ while read -r line; do \ - if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \ - elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \ + if grep -qFx "#$$line" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \ + elif grep -qFx "$$line" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \ else echo "+$$line" >> $(TARGET); \ fi; \ done < $(TARGET)_diff; \ grep -v "^#" $(TARGET)_rootfile | while read -r line; do \ - if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \ + if ! grep -qFx "$$line" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \ fi; \ done; \ rm -f $(TARGET)_rootfile; \ diff --git a/lfs/flash-images b/lfs/flash-images index 30513f0bc..27d3a89d7 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -126,7 +126,7 @@ endif ifeq "$(EFI)" "1" mkfs.vfat $(PART_EFI) endif - mkfs.ext4 -O ^has_journal,extent -F $(PART_ROOT) + mkfs.ext4 -F $(PART_ROOT)
# Most systems that use Flashimages has no RTC at boot # so the interval check should disables diff --git a/lfs/libcap b/lfs/libcap index c4a50b2c7..99fd26bb7 100644 --- a/lfs/libcap +++ b/lfs/libcap @@ -24,7 +24,7 @@
include Config
-VER = 2.72 +VER = 2.73
THISAPP = libcap-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2c854fd9a714ab1daae3831829b4b7a890a0894953ba88ae1e190274e7fc635275ce4bf2c668b390ba8196248cb1f953fafb3a9af3907e688c1ab40774f7c6e0 +$(DL_FILE)_BLAKE2 = c8ea9b8accc4034adfd31295ec9356dcce3ae46b3e532e089248c20d0f148de17c9a0525e9f15ac839f83351cdff9e0f9e91ee8966c34116ad1411917f9358b2
install : $(TARGET)
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index df9c43991..832bc7237 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -48,7 +48,6 @@ case "${1}" in # Azure and Google Compute Platform if running_on_ec2 || running_on_oci || running_on_azure || running_on_gcp; then scon="on" - journal="on" fi
mount /boot > /dev/null @@ -110,18 +109,6 @@ case "${1}" in root_dev="${dev::-2}" fi
- # Check if the device support smart - smartctl --smart=on "${root_dev}" > /dev/null - if [ ${?} = 0 ]; then - journal="on" - fi - - # Enable journal - if [ "${journal}" = "on" ]; then - boot_mesg "Create journal on "${dev}" ..." - tune2fs -O has_journal "${dev}" - fi - boot_mesg "Growing root partition to maximum size..." echo -e ',+' | sfdisk --no-reread -f -N${part_num} "${root_dev}" 2>/dev/null
diff --git a/src/installer/hw.c b/src/installer/hw.c index 6bf05b185..577780af9 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -923,10 +923,6 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) { } else if (fs == HW_FS_EXT4) { snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
- // EXT4 w/o journal - } else if (fs == HW_FS_EXT4_WO_JOURNAL) { - snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path); - // XFS } else if (fs == HW_FS_XFS) { snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path); @@ -1027,7 +1023,6 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { const char* filesystem; switch (dest->filesystem) { case HW_FS_EXT4: - case HW_FS_EXT4_WO_JOURNAL: filesystem = "ext4"; break;
diff --git a/src/installer/hw.h b/src/installer/hw.h index 92f32b67f..e1c3d345f 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -43,10 +43,9 @@
#define HW_FS_SWAP 0 #define HW_FS_EXT4 1 -#define HW_FS_EXT4_WO_JOURNAL 2 -#define HW_FS_XFS 3 -#define HW_FS_FAT32 4 -#define HW_FS_BTRFS 5 +#define HW_FS_XFS 2 +#define HW_FS_FAT32 3 +#define HW_FS_BTRFS 4
#define HW_FS_DEFAULT HW_FS_EXT4
diff --git a/src/installer/main.c b/src/installer/main.c index 9e3f4af83..9b9c630c3 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -644,7 +644,6 @@ int main(int argc, char *argv[]) { char* description; } filesystems[] = { { HW_FS_EXT4, _("ext4 Filesystem") }, - { HW_FS_EXT4_WO_JOURNAL, _("ext4 Filesystem without journal") }, { HW_FS_XFS, _("XFS Filesystem") }, { HW_FS_BTRFS, _("BTRFS Filesystem (EXPERIMENTAL)") }, { 0, NULL },
hooks/post-receive -- IPFire 2.x development tree