Allow including initramfs-extra files in the initramfs (MR 48)
This uses a "deviceinfo_create_initfs_extra" to allow including initramfs-extra files in the initramfs and skip creating a separate initramfs-extra archive when it's set to "false". If this variable is unset, mkinitfs uses a default value of "false".
This commit is contained in:
@@ -21,6 +21,7 @@ type DeviceInfo struct {
|
||||
UbootBoardname string
|
||||
GenerateSystemdBoot string
|
||||
FormatVersion string
|
||||
CreateInitfsExtra bool
|
||||
}
|
||||
|
||||
// Reads the relevant entries from "file" into DeviceInfo struct
|
||||
@@ -112,6 +113,7 @@ func (d DeviceInfo) String() string {
|
||||
%s: %v
|
||||
%s: %v
|
||||
%s: %v
|
||||
%s: %v
|
||||
}`,
|
||||
"deviceinfo_format_version", d.FormatVersion,
|
||||
"deviceinfo_", d.FormatVersion,
|
||||
@@ -120,5 +122,6 @@ func (d DeviceInfo) String() string {
|
||||
"deviceinfo_ubootBoardname", d.UbootBoardname,
|
||||
"deviceinfo_generateSystemdBoot", d.GenerateSystemdBoot,
|
||||
"deviceinfo_formatVersion", d.FormatVersion,
|
||||
"deviceinfo_createInitfsExtra", d.CreateInitfsExtra,
|
||||
)
|
||||
}
|
||||
|
@@ -42,6 +42,7 @@ func TestNameToField(t *testing.T) {
|
||||
{"modules_initfs", "ModulesInitfs"},
|
||||
{"deviceinfo_initfs_compression___", "InitfsCompression"},
|
||||
{"deviceinfo_initfs_extra_compression", "InitfsExtraCompression"},
|
||||
{"deviceinfo_create_initfs_extra", "CreateInitfsExtra"},
|
||||
}
|
||||
|
||||
for _, table := range tables {
|
||||
@@ -65,6 +66,7 @@ func TestUnmarshal(t *testing.T) {
|
||||
UbootBoardname: "foobar-bazz",
|
||||
InitfsCompression: "zstd:--foo=1 -T0 --bar=bazz",
|
||||
InitfsExtraCompression: "",
|
||||
CreateInitfsExtra: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@@ -4,3 +4,4 @@ deviceinfo_uboot_boardname="foobar-bazz"
|
||||
deviceinfo_initfs_compression="zstd:--foo=1 -T0 --bar=bazz"
|
||||
# empty option
|
||||
deviceinfo_initfs_extra_compression=""
|
||||
deviceinfo_create_initfs_extra="true"
|
||||
|
Reference in New Issue
Block a user