matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update initramfs-tools from 0.133 to 0.140

Browse Source 
Also update the patch to add support for booting from squashfs to fix a
shellcheck warning.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2021-07-12 15:55:04 -07:00 committed by Saikrishna Arcot
parent 4f9569132f
commit 371f496340
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/initramfs-tools.mk
View File

@ -1,6 +1,6 @@
# initramfs-tools package # initramfs-tools package
INITRAMFS_TOOLS_VERSION = 0.133 INITRAMFS_TOOLS_VERSION = 0.140
export INITRAMFS_TOOLS_VERSION export INITRAMFS_TOOLS_VERSION
INITRAMFS_TOOLS = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb INITRAMFS_TOOLS = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb

4
src/initramfs-tools/Makefile
View File

@ -5,12 +5,12 @@ SHELL = /bin/bash
MAIN_TARGET = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb MAIN_TARGET = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb
DERIVED_TARGETS = initramfs-tools-core_$(INITRAMFS_TOOLS_VERSION)_all.deb DERIVED_TARGETS = initramfs-tools-core_$(INITRAMFS_TOOLS_VERSION)_all.deb
INITRAMFS_TOOLS_REVISION = 40e544e13611c1b2690eb99a8096fc16c1b9c74e INITRAMFS_TOOLS_REVISION = v$(INITRAMFS_TOOLS_VERSION)
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the initramfs-tools # Obtaining the initramfs-tools
rm -rf ./initramfs-tools rm -rf ./initramfs-tools
git clone --branch v0.133 https://salsa.debian.org/kernel-team/initramfs-tools.git ./initramfs-tools git clone https://salsa.debian.org/kernel-team/initramfs-tools.git ./initramfs-tools
# Patch # Patch
pushd ./initramfs-tools pushd ./initramfs-tools

2
src/initramfs-tools/loopback-file-offset-support.patch
View File

@ -57,7 +57,7 @@ index a17e740..2bef5cb 100644
modprobe loop modprobe loop
modprobe "${FSTYPE}" modprobe "${FSTYPE}"
+ if [ ! -z "${LOOPOFFSET}" ]; then + if [ -n "${LOOPOFFSET}" ]; then
+ # create a loop device for the fs within the file + # create a loop device for the fs within the file
+ loopdev="$(losetup -f)" + loopdev="$(losetup -f)"
+ losetup -o "${LOOPOFFSET:-0}" "${loopdev}" "${loopfile}" || \ + losetup -o "${LOOPOFFSET:-0}" "${loopdev}" "${loopfile}" || \