fix.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- a/include/image.mk
  2. +++ b/include/image.mk
  3. @@ -609,6 +609,7 @@ define Device/Build/image
  4. IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \
  5. IMAGE_FILESYSTEM="$(1)" \
  6. IMAGE_PREFIX="$(IMAGE_PREFIX)" \
  7. + KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
  8. DEVICE_VENDOR="$(DEVICE_VENDOR)" \
  9. DEVICE_MODEL="$(DEVICE_MODEL)" \
  10. DEVICE_VARIANT="$(DEVICE_VARIANT)" \
  11. --- a/scripts/json_add_image_info.py
  12. +++ b/scripts/json_add_image_info.py
  13. @@ -48,6 +48,7 @@ def get_titles():
  14. "profiles": {
  15. device_id: {
  16. "image_prefix": getenv("IMAGE_PREFIX"),
  17. + "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
  18. "images": [
  19. {
  20. "type": getenv("IMAGE_TYPE"),
  21. --- a/scripts/json_overview_image_info.py
  22. +++ b/scripts/json_overview_image_info.py
  23. @@ -47,7 +47,7 @@ def get_initial_output(image_info):
  24. if output:
  25. - default_packages, output["arch_packages"] = run(
  26. + default_packages, output["arch_packages"], output["kernel_version"] = run(
  27. [
  28. "make",
  29. "--no-print-directory",
  30. @@ -55,6 +55,7 @@ def get_initial_output(image_info):
  31. "target/linux/",
  32. "val.DEFAULT_PACKAGES",
  33. "val.ARCH_PACKAGES",
  34. + "val.LINUX_VERSION",
  35. ],
  36. stdout=PIPE,
  37. stderr=PIPE,