IPFire-SCM January 2025

ipfire-scm@lists.ipfire.org

1 participants
3 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 23e8b462f3775ffe0511ecc736a9d4fe490047a4
by Arne Fitzenreiter 03 Jan '25

03 Jan '25

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 23e8b462f3775ffe0511ecc736a9d4fe490047a4 (commit) from de8edcf515c7f856d10fad1f5d1421538048fa09 (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 23e8b462f3775ffe0511ecc736a9d4fe490047a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 3 00:48:18 2025 +0000 u-boot: fix settings and patch for rk3399 distro_bootcmd was not correct added for this board. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/u-boot | 16 +++---- ...10-revert_rockchip_distro_bootcmd_removal.patch | 54 +++++++++++++++------- 2 files changed, 45 insertions(+), 25 deletions(-) Difference in files: diff --git a/lfs/u-boot b/lfs/u-boot index 3799323ba..de95719cb 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -131,10 +131,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/share/u-boot/nanopi_r2s cd $(DIR_APP) && make CROSS_COMPILE="" nanopi-r2s-rk3328_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R2S - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config - cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config cd $(DIR_APP) && make BL31=$(DIR_APP)/bl31.elf CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ /usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin @@ -149,10 +149,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/share/u-boot/nanopi_r2c cd $(DIR_APP) && make CROSS_COMPILE="" nanopi-r2c-rk3328_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R2C - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config - cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config cd $(DIR_APP) && make BL31=$(DIR_APP)/bl31.elf CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ /usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin @@ -167,10 +167,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/share/u-boot/orangepi_r1_plus_lts cd $(DIR_APP) && make CROSS_COMPILE="" orangepi-r1-plus-lts-rk3328_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi R1 plus lts - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config - cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config cd $(DIR_APP) && make BL31=$(DIR_APP)/bl31.elf CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ /usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin @@ -183,10 +183,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/share/u-boot/nanopi_r4s cd $(DIR_APP) && make BL31=$(DIR_APP)/bl31.elf CROSS_COMPILE="" nanopi-r4s-rk3399_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R4S - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config - cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config cd $(DIR_APP) && make BL31=$(DIR_APP)/bl31.elf CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ /usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin diff --git a/src/patches/u-boot/u-boot-2024.10-revert_rockchip_distro_bootcmd_removal.patch b/src/patches/u-boot/u-boot-2024.10-revert_rockchip_distro_bootcmd_removal.patch index cb3d03cdb..63f9bdd30 100644 --- a/src/patches/u-boot/u-boot-2024.10-revert_rockchip_distro_bootcmd_removal.patch +++ b/src/patches/u-boot/u-boot-2024.10-revert_rockchip_distro_bootcmd_removal.patch @@ -1,19 +1,18 @@ diff -Naur u-boot-2024.10.org/arch/arm/Kconfig u-boot-2024.10/arch/arm/Kconfig --- u-boot-2024.10.org/arch/arm/Kconfig 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/arch/arm/Kconfig 2024-12-30 13:49:36.476480002 +0000 -@@ -2035,7 +2035,8 @@ ++++ u-boot-2024.10/arch/arm/Kconfig 2025-01-02 21:34:06.410041224 +0000 +@@ -2035,7 +2035,7 @@ imply ADC imply CMD_DM imply DEBUG_UART_BOARD_INIT - imply BOOTSTD_DEFAULTS -+ imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399 + imply BOOTSTD_DEFAULTS if !DISTRO_DEFAULTS imply FAT_WRITE imply SARADC_ROCKCHIP imply SPL_SYSRESET diff -Naur u-boot-2024.10.org/include/configs/px30_common.h u-boot-2024.10/include/configs/px30_common.h --- u-boot-2024.10.org/include/configs/px30_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/px30_common.h 2024-12-30 13:49:36.477479987 +0000 ++++ u-boot-2024.10/include/configs/px30_common.h 2025-01-02 21:05:11.028374025 +0000 @@ -25,11 +25,12 @@ "kernel_comp_addr_r=0x03e80000\0" \ "kernel_comp_size=0x2000000\0" @@ -30,7 +29,7 @@ diff -Naur u-boot-2024.10.org/include/configs/px30_common.h u-boot-2024.10/inclu #endif diff -Naur u-boot-2024.10.org/include/configs/rk3036_common.h u-boot-2024.10/include/configs/rk3036_common.h --- u-boot-2024.10.org/include/configs/rk3036_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3036_common.h 2024-12-30 13:49:36.478479972 +0000 ++++ u-boot-2024.10/include/configs/rk3036_common.h 2025-01-02 21:05:11.029374011 +0000 @@ -20,6 +20,8 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" @@ -50,7 +49,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3036_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk3066_common.h u-boot-2024.10/include/configs/rk3066_common.h --- u-boot-2024.10.org/include/configs/rk3066_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3066_common.h 2024-12-30 13:49:36.478479972 +0000 ++++ u-boot-2024.10/include/configs/rk3066_common.h 2025-01-02 21:05:11.030373996 +0000 @@ -21,12 +21,14 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" @@ -69,7 +68,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3066_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk3128_common.h u-boot-2024.10/include/configs/rk3128_common.h --- u-boot-2024.10.org/include/configs/rk3128_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3128_common.h 2024-12-30 13:49:36.479479958 +0000 ++++ u-boot-2024.10/include/configs/rk3128_common.h 2025-01-02 21:05:11.031373981 +0000 @@ -22,10 +22,11 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" @@ -85,7 +84,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3128_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk3188_common.h u-boot-2024.10/include/configs/rk3188_common.h --- u-boot-2024.10.org/include/configs/rk3188_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3188_common.h 2024-12-30 13:49:36.479479958 +0000 ++++ u-boot-2024.10/include/configs/rk3188_common.h 2025-01-02 21:05:11.034373936 +0000 @@ -20,6 +20,8 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" @@ -105,7 +104,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3188_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk322x_common.h u-boot-2024.10/include/configs/rk322x_common.h --- u-boot-2024.10.org/include/configs/rk322x_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk322x_common.h 2024-12-30 13:49:36.480479943 +0000 ++++ u-boot-2024.10/include/configs/rk322x_common.h 2025-01-02 21:05:11.035373921 +0000 @@ -21,6 +21,8 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" @@ -125,7 +124,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk322x_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk3288_common.h u-boot-2024.10/include/configs/rk3288_common.h --- u-boot-2024.10.org/include/configs/rk3288_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3288_common.h 2024-12-30 13:49:36.480479943 +0000 ++++ u-boot-2024.10/include/configs/rk3288_common.h 2025-01-02 21:05:11.036373906 +0000 @@ -22,6 +22,8 @@ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" @@ -145,7 +144,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3288_common.h u-boot-2024.10/inc #endif diff -Naur u-boot-2024.10.org/include/configs/rk3308_common.h u-boot-2024.10/include/configs/rk3308_common.h --- u-boot-2024.10.org/include/configs/rk3308_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3308_common.h 2024-12-30 14:01:57.925815373 +0000 ++++ u-boot-2024.10/include/configs/rk3308_common.h 2025-01-02 21:05:11.037373891 +0000 @@ -25,11 +25,13 @@ "kernel_comp_addr_r=0x08000000\0" \ "kernel_comp_size=0x2000000\0" @@ -162,7 +161,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3308_common.h u-boot-2024.10/inc #endif /* __CONFIG_RK3308_COMMON_H */ diff -Naur u-boot-2024.10.org/include/configs/rk3328_common.h u-boot-2024.10/include/configs/rk3328_common.h --- u-boot-2024.10.org/include/configs/rk3328_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3328_common.h 2024-12-30 14:06:25.263035725 +0000 ++++ u-boot-2024.10/include/configs/rk3328_common.h 2025-01-02 21:05:11.041373832 +0000 @@ -25,11 +25,12 @@ "kernel_comp_addr_r=0x08000000\0" \ "kernel_comp_size=0x2000000\0" @@ -179,7 +178,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3328_common.h u-boot-2024.10/inc #endif /* __CONFIG_RK3328_COMMON_H */ diff -Naur u-boot-2024.10.org/include/configs/rk3368_common.h u-boot-2024.10/include/configs/rk3368_common.h --- u-boot-2024.10.org/include/configs/rk3368_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3368_common.h 2024-12-30 13:49:36.482479914 +0000 ++++ u-boot-2024.10/include/configs/rk3368_common.h 2025-01-02 21:05:11.042373817 +0000 @@ -22,9 +22,11 @@ "kernel_addr_r=0x280000\0" \ "ramdisk_addr_r=0x5bf0000\0" @@ -194,9 +193,30 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3368_common.h u-boot-2024.10/inc + BOOTENV #endif +diff -Naur u-boot-2024.10.org/include/configs/rk3399_common.h u-boot-2024.10/include/configs/rk3399_common.h +--- u-boot-2024.10.org/include/configs/rk3399_common.h 2024-10-07 14:54:35.000000000 +0000 ++++ u-boot-2024.10/include/configs/rk3399_common.h 2025-01-02 23:03:05.501053098 +0000 +@@ -31,12 +31,16 @@ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" + ++#include <config_distro_bootcmd.h> ++#include <env/distro/sf.h> ++ + #define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ +- "boot_targets=" BOOT_TARGETS "\0" ++ BOOTENV \ ++ BOOTENV_SF + + #endif /* CONFIG_SPL_BUILD */ + diff -Naur u-boot-2024.10.org/include/configs/rk3568_common.h u-boot-2024.10/include/configs/rk3568_common.h --- u-boot-2024.10.org/include/configs/rk3568_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3568_common.h 2024-12-30 14:03:57.919116640 +0000 ++++ u-boot-2024.10/include/configs/rk3568_common.h 2025-01-02 21:05:11.042373817 +0000 @@ -27,11 +27,14 @@ "ramdisk_addr_r=0x12180000\0" \ "kernel_comp_size=0x8000000\0" @@ -214,7 +234,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3568_common.h u-boot-2024.10/inc #endif /* __CONFIG_RK3568_COMMON_H */ diff -Naur u-boot-2024.10.org/include/configs/rk3588_common.h u-boot-2024.10/include/configs/rk3588_common.h --- u-boot-2024.10.org/include/configs/rk3588_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rk3588_common.h 2024-12-30 14:05:20.861944658 +0000 ++++ u-boot-2024.10/include/configs/rk3588_common.h 2025-01-02 21:05:11.043373802 +0000 @@ -26,11 +26,12 @@ "ramdisk_addr_r=0x12180000\0" \ "kernel_comp_size=0x8000000\0" @@ -231,7 +251,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rk3588_common.h u-boot-2024.10/inc #endif /* __CONFIG_RK3588_COMMON_H */ diff -Naur u-boot-2024.10.org/include/configs/rockchip-common.h u-boot-2024.10/include/configs/rockchip-common.h --- u-boot-2024.10.org/include/configs/rockchip-common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rockchip-common.h 2024-12-30 13:59:28.290940486 +0000 ++++ u-boot-2024.10/include/configs/rockchip-common.h 2025-01-02 21:05:11.044373787 +0000 @@ -13,7 +13,69 @@ #ifndef CONFIG_SPL_BUILD @@ -304,7 +324,7 @@ diff -Naur u-boot-2024.10.org/include/configs/rockchip-common.h u-boot-2024.10/i #define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0" diff -Naur u-boot-2024.10.org/include/configs/rv1108_common.h u-boot-2024.10/include/configs/rv1108_common.h --- u-boot-2024.10.org/include/configs/rv1108_common.h 2024-10-07 14:54:35.000000000 +0000 -+++ u-boot-2024.10/include/configs/rv1108_common.h 2024-12-30 13:49:36.484479884 +0000 ++++ u-boot-2024.10/include/configs/rv1108_common.h 2025-01-02 21:05:11.048373728 +0000 @@ -27,6 +27,6 @@ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. de8edcf515c7f856d10fad1f5d1421538048fa09
by Arne Fitzenreiter 02 Jan '25

02 Jan '25

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 de8edcf515c7f856d10fad1f5d1421538048fa09 (commit) via e3b5000b8318591a239125560b9e5fa101a3802e (commit) from fb0fc29abc107cf356ecdfe01299427e683144e0 (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 de8edcf515c7f856d10fad1f5d1421538048fa09 Merge: fb0fc29abc e3b5000b83 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 2 10:16:08 2025 +0100 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/elinks | 7 ++++--- config/rootfiles/oldcore/191/update.sh | 2 +- lfs/elinks | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks index 3c4ad031a..004caac03 100644 --- a/config/rootfiles/common/elinks +++ b/config/rootfiles/common/elinks @@ -1,6 +1,7 @@ -#root/.config/.elinks -root/.config/.elinks/bookmarks -root/.config/.elinks/globhist +#root/.config +#root/.config/elinks +root/.config/elinks/bookmarks +root/.config/elinks/globhist usr/local/bin/elinks #usr/local/etc #usr/local/etc/elinks diff --git a/config/rootfiles/oldcore/191/update.sh b/config/rootfiles/oldcore/191/update.sh index acfa01eb4..85c9738f7 100644 --- a/config/rootfiles/oldcore/191/update.sh +++ b/config/rootfiles/oldcore/191/update.sh @@ -49,7 +49,7 @@ fi # move elinks config to new dir if [ -e /root/.elinks/* ]; then - mv /root/.elinks/* /root/.config/.elinks/ + mv /root/.elinks/* /root/.config/elinks/ rm -rf /root/.elinks fi diff --git a/lfs/elinks b/lfs/elinks index 64b7b7fce..389cd1772 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -87,9 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Suppress first welcome dialog by creating bookmark # and history files for root - mkdir -p /root/.config/.elinks - touch /root/.config/.elinks/bookmarks - touch /root/.config/.elinks/globhist + mkdir -p /root/.config/elinks + touch /root/.config/elinks/bookmarks + touch /root/.config/elinks/globhist @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e3b5000b8318591a239125560b9e5fa101a3802e
by Arne Fitzenreiter 02 Jan '25

02 Jan '25

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, master has been updated via e3b5000b8318591a239125560b9e5fa101a3802e (commit) from 8ceaf358ae36764661c2a70432b78ff879ac845b (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 e3b5000b8318591a239125560b9e5fa101a3802e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 2 10:15:23 2025 +0100 elinks: fix new configuration path Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/elinks | 7 ++++--- config/rootfiles/core/191/update.sh | 2 +- lfs/elinks | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks index 3c4ad031a..004caac03 100644 --- a/config/rootfiles/common/elinks +++ b/config/rootfiles/common/elinks @@ -1,6 +1,7 @@ -#root/.config/.elinks -root/.config/.elinks/bookmarks -root/.config/.elinks/globhist +#root/.config +#root/.config/elinks +root/.config/elinks/bookmarks +root/.config/elinks/globhist usr/local/bin/elinks #usr/local/etc #usr/local/etc/elinks diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh index acfa01eb4..85c9738f7 100644 --- a/config/rootfiles/core/191/update.sh +++ b/config/rootfiles/core/191/update.sh @@ -49,7 +49,7 @@ fi # move elinks config to new dir if [ -e /root/.elinks/* ]; then - mv /root/.elinks/* /root/.config/.elinks/ + mv /root/.elinks/* /root/.config/elinks/ rm -rf /root/.elinks fi diff --git a/lfs/elinks b/lfs/elinks index 64b7b7fce..389cd1772 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -87,9 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Suppress first welcome dialog by creating bookmark # and history files for root - mkdir -p /root/.config/.elinks - touch /root/.config/.elinks/bookmarks - touch /root/.config/.elinks/globhist + mkdir -p /root/.config/elinks + touch /root/.config/elinks/bookmarks + touch /root/.config/elinks/globhist @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2025