Changeset 14826


Ignorieren:
Zeitstempel:
18.08.2018 14:18:27 (vor 5 Wochen)
Autor:
er13
Nachricht:

yourfritz-host: bump version to the latest git revision

which contains boot-manager fixes & improvements, thanks to PeterPawn for that!

The new boot-manager version is expected to work also with Fritz!OS 7.0X, refs #2980

Ort:
trunk
Dateien:
1 gelöscht
2 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/patches/scripts/800-modfs_boot_manager.sh

    r14823 r14826  
    11[ "$FREETZ_PATCH_MODFS_BOOT_MANAGER" = "y" ] || return 0; 
    22 
     3echo1 "adding modfs boot-manager" 
     4 
     5system_reboot_lua_patch=$(mktemp -q -t "bootmanager_system_reboot_lua-XXXXXX.patch") 
    36for oem in $(supported_brandings) all; do 
    47    www_oem="${FILESYSTEM_MOD_DIR}/usr/www/${oem}" 
    58    [ -d "${www_oem}" -a ! -L "${www_oem}" ] || continue 
    69 
    7     echo1 "adding modfs boot-manager to branding \"${oem}\"" 
    8     for step in precheck install postcheck; do 
    9         TARGET_BRANDINGS=${oem} \ 
    10         TARGET_BRANDING=${oem} \ 
    11         source "${TOOLS_DIR}/modfs/modscripts/gui_boot_manager_v0.4" \ 
    12             en \ 
    13             "${FILESYSTEM_MOD_DIR}" \ 
    14             "MODE (UNUSED)" \ 
    15             "${step}" 
    16         [ $? -eq 0 ] || error 1 "adding modfs boot-manager failed in step \"${step}\"" 
    17     done 
     10    echo2 "adding boot-manager front end to branding \"${oem}\"" 
     11 
     12    cat "${TOOLS_DIR}/yf/bootmanager/patch_system_reboot_lua.patch" \ 
     13    | sed -r -e 's,^(([+]{3}|-{3}) usr/www/)[^/]+/,\1'"${oem}"'/,' \ 
     14    > "${system_reboot_lua_patch}" 
     15 
     16    modpatch "$FILESYSTEM_MOD_DIR" "${system_reboot_lua_patch}" 
    1817done 
     18rm -f "${system_reboot_lua_patch}" 
    1919 
    20 # replace modfs version of boot-manager with a more recent one from YourFritz project 
     20echo2 "adding boot-manager back end script" 
    2121cp -a "${TOOLS_DIR}/yf/bootmanager/gui_bootmanager" "${FILESYSTEM_MOD_DIR}/usr/bin/" 
    2222chmod 755 "${FILESYSTEM_MOD_DIR}/usr/bin/gui_bootmanager" 
  • trunk/tools/make/yourfritz-host/yourfritz-host.mk

    r14793 r14826  
    1 YOURFRITZ_HOST_VERSION:=e7bc4af34b 
     1YOURFRITZ_HOST_VERSION:=bc48894bcc 
    22YOURFRITZ_HOST_SOURCE:=yourfritz-$(YOURFRITZ_HOST_VERSION).tar.xz 
    33YOURFRITZ_HOST_SITE:=git_no_submodules@https://github.com/PeterPawn/YourFritz.git 
     
    1717YOURFRITZ_HOST_BASH_AS_SHEBANG += avm_kernel_config/unpack_kernel.sh 
    1818 
     19YOURFRITZ_HOST_STRIP_TRAILING_WHITESPACES += bootmanager/gui_bootmanager 
     20 
    1921YOURFRITZ_HOST_MAKE_DIR:=$(TOOLS_DIR)/make/yourfritz-host 
    2022YOURFRITZ_HOST_DIR:=$(TOOLS_SOURCE_DIR)/yourfritz-$(YOURFRITZ_HOST_VERSION) 
     
    2931    $(call APPLY_PATCHES,$(YOURFRITZ_HOST_MAKE_DIR)/patches,$(YOURFRITZ_HOST_DIR)) 
    3032    @$(SED) -i -r -e '1 s,^($(_hash)$(_bang)[ \t]*/bin/)(sh),\1ba\2,' $(YOURFRITZ_HOST_BASH_AS_SHEBANG:%=$(YOURFRITZ_HOST_DIR)/%) 
     33    @$(SED) -i -r -e 's,([ \t])+$(_dollar),,' $(YOURFRITZ_HOST_STRIP_TRAILING_WHITESPACES:%=$(YOURFRITZ_HOST_DIR)/%) 
    3134    touch $@ 
    3235 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.