Skip to content

Commit

Permalink
firmware-legacy-merger: also merge non-sysupgrades
Browse files Browse the repository at this point in the history
Currently, the firmware-legacy-merger does not merge packages and factory
files of either.
Do not merge those, but use the ones from the latest version available.
  • Loading branch information
grische committed Nov 22, 2023
1 parent 481318e commit 95df121
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions github-downloader/firmware-legacy-merger
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,8 @@ rm -r "$TEMP_DIR"
merge_sysupgrade_files "${FIRMWARE_DIR_LEGACY}" "${FIRMWARE_DIR_STABLE}" "${FIRMWARE_DIR_MERGED}"

echo "Finishing merging sysupgrade folders of ${LEGACY_VERSION} and ${STABLE_VERSION} in ${FIRMWARE_DIR_MERGED}"

# Hardlink all other folders as well
shopt -s extglob
cp -lR "${FIRMWARE_DIR_STABLE}"/!(sysupgrade) "${FIRMWARE_DIR_MERGED}/"
shopt -u extglob # disable extglob to avoid inintentional globbing further down

0 comments on commit 95df121

Please sign in to comment.