diff options
Diffstat (limited to 'import-layers/yocto-poky/scripts/lib')
51 files changed, 118 insertions, 103 deletions
diff --git a/import-layers/yocto-poky/scripts/lib/bsp/kernel.py b/import-layers/yocto-poky/scripts/lib/bsp/kernel.py index a3ee325a8..32cab3b64 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/kernel.py +++ b/import-layers/yocto-poky/scripts/lib/bsp/kernel.py @@ -331,6 +331,7 @@ def write_patch_items(scripts_path, machine, patch_items): patch list [${machine}-user-patches.scc]. """ f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w") + f.write("mark patching start\n") for item in patch_items: f.write("patch " + item + "\n") f.close() diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend index 2d3d073f7..1d7886576 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1"
\ No newline at end of file diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend index b88a06c52..1725bf4bc 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend index 7c0df8bcd..15d6431e2 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend index aecdff025..8d7e24e6d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend index dd4de311a..16a24f0cd 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend index 137d8fa51..9a97de960 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend index 1e99a04dc..f4efb753a 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend index b88a06c52..1725bf4bc 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.8.bbappend index 7c0df8bcd..15d6431e2 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend index 01a046c75..7d0f7df6b 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend index 57c90fa3a..4d89f5ca4 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.8.bbappend index accf9d5d8..17d1ea6eb 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend index 1e99a04dc..f4efb753a 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend index b88a06c52..1725bf4bc 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.8.bbappend index 7c0df8bcd..15d6431e2 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 14ee16f32..fe22d3e15 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -57,6 +57,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index e256e08bd..828afe557 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -57,6 +57,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index c1635d6f6..df65fd02f 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -57,6 +57,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend index fce67b4aa..689578840 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -56,6 +56,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend index 409793228..3549de58e 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -56,6 +56,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend index e8c3fc82e..4176e5ac4 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -56,6 +56,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37..f4fc21930 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b81..4ec3e480d 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab..51cb0124c 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend index 1e99a04dc..f4efb753a 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.1" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend index b88a06c52..1725bf4bc 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.4" diff --git a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.8.bbappend b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.8.bbappend index 7c0df8bcd..15d6431e2 100644 --- a/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/import-layers/yocto-poky/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.8.bbappend @@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" -SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" #LINUX_VERSION = "4.8" diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py b/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py index e41d81a31..82a2be122 100644 --- a/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py +++ b/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py @@ -512,7 +512,7 @@ class PythonRecipeHandler(RecipeHandler): except (OSError, subprocess.CalledProcessError): pass else: - for line in dep_output.decode('utf-8').splitlines(): + for line in dep_output.splitlines(): line = line.rstrip() dep, filename = line.split('\t', 1) if filename.endswith('/setup.py'): @@ -591,7 +591,7 @@ class PythonRecipeHandler(RecipeHandler): if 'stderr' not in popenargs: popenargs['stderr'] = subprocess.STDOUT try: - return subprocess.check_output(cmd, **popenargs) + return subprocess.check_output(cmd, **popenargs).decode('utf-8') except OSError as exc: logger.error('Unable to run `{}`: {}', ' '.join(cmd), exc) raise diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks index b90002356..4bd9d6a65 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks +++ b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks @@ -4,7 +4,7 @@ part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid part swap --ondisk sda --size 44 --label swap1 --fstype=swap diff --git a/import-layers/yocto-poky/scripts/lib/wic/filemap.py b/import-layers/yocto-poky/scripts/lib/wic/filemap.py index f3240ba8d..162603ed0 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/filemap.py +++ b/import-layers/yocto-poky/scripts/lib/wic/filemap.py @@ -543,9 +543,9 @@ def sparse_copy(src_fname, dst_fname, offset=0, skip=0): end = (last + 1) * fmap.block_size if start < skip < end: - start = skip - - fmap._f_image.seek(start, os.SEEK_SET) + fmap._f_image.seek(skip, os.SEEK_SET) + else: + fmap._f_image.seek(start, os.SEEK_SET) dst_file.seek(offset + start, os.SEEK_SET) chunk_size = 1024 * 1024 diff --git a/import-layers/yocto-poky/scripts/lib/wic/imager/direct.py b/import-layers/yocto-poky/scripts/lib/wic/imager/direct.py index edf5e5d22..4c547e04a 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/imager/direct.py +++ b/import-layers/yocto-poky/scripts/lib/wic/imager/direct.py @@ -108,7 +108,7 @@ class DirectImageCreator(BaseImageCreator): if pnum == num: if part.no_table: return 0 - if self.ptable_format == 'msdos' and realnum > 3: + if self.ptable_format == 'msdos' and realnum > 3 and len(parts) > 4: # account for logical partition numbering, ex. sda5.. return realnum + 1 return realnum diff --git a/import-layers/yocto-poky/scripts/lib/wic/partition.py b/import-layers/yocto-poky/scripts/lib/wic/partition.py index 90f65a1e3..ec3aa6622 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/partition.py +++ b/import-layers/yocto-poky/scripts/lib/wic/partition.py @@ -146,6 +146,12 @@ class Partition(): oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot) + # further processing required Partition.size to be an integer, make + # sure that it is one + if type(self.size) is not int: + msger.error("Partition %s internal size is not an integer. " \ + "This a bug in source plugin %s and needs to be fixed." \ + % (self.mountpoint, self.source)) def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir, rootfs_dir): @@ -157,7 +163,7 @@ class Partition(): out = exec_cmd(du_cmd) rootfs_size = out.split()[0] - self.size = rootfs_size + self.size = int(rootfs_size) self.source_file = rootfs def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir, @@ -184,6 +190,10 @@ class Partition(): if os.path.isfile(rootfs): os.remove(rootfs) + if not self.fstype: + msger.error("File system for partition %s not specified in kickstart, " \ + "use --fstype option" % (self.mountpoint)) + for prefix in ("ext", "btrfs", "vfat", "squashfs"): if self.fstype.startswith(prefix): method = getattr(self, "prepare_rootfs_" + prefix) @@ -194,7 +204,7 @@ class Partition(): # get the rootfs size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % rootfs out = exec_cmd(du_cmd) - self.size = out.split()[0] + self.size = int(out.split()[0]) break @@ -229,6 +239,9 @@ class Partition(): (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir) exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) + mkfs_cmd = "fsck.%s -pvfD %s || [ $? -le 3 ]" % (self.fstype, rootfs) + exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) + def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ @@ -375,7 +388,7 @@ class Partition(): out = exec_cmd(du_cmd) fs_size = out.split()[0] - self.size = fs_size + self.size = int(fs_size) def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot): """ diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py b/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py index 8bc362254..4adb80bec 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -234,5 +234,5 @@ class BootimgEFIPlugin(SourcePlugin): out = exec_cmd(du_cmd) bootimg_size = out.split()[0] - part.size = bootimg_size + part.size = int(bootimg_size) part.source_file = bootimg diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py b/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py index e0b11f95a..618dd4475 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py +++ b/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py @@ -71,16 +71,16 @@ class RawCopyPlugin(SourcePlugin): dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno)) if 'skip' in source_params: - sparse_copy(src, dst, skip=source_params['skip']) + sparse_copy(src, dst, skip=int(source_params['skip'])) else: sparse_copy(src, dst) # get the size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % dst out = exec_cmd(du_cmd) - filesize = out.split()[0] + filesize = int(out.split()[0]) - if int(filesize) > int(part.size): + if filesize > part.size: part.size = filesize part.source_file = dst diff --git a/import-layers/yocto-poky/scripts/lib/wic/utils/partitionedfs.py b/import-layers/yocto-poky/scripts/lib/wic/utils/partitionedfs.py index cb03009fc..9ea4a30cb 100644 --- a/import-layers/yocto-poky/scripts/lib/wic/utils/partitionedfs.py +++ b/import-layers/yocto-poky/scripts/lib/wic/utils/partitionedfs.py @@ -92,7 +92,7 @@ class Image(): def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None, label=None, fsopts=None, boot=False, align=None, no_table=False, part_type=None, uuid=None, system_id=None): - """ Add the next partition. Prtitions have to be added in the + """ Add the next partition. Partitions have to be added in the first-to-last order. """ ks_pnum = len(self.partitions) @@ -201,9 +201,10 @@ class Image(): part['num'] = 0 if disk['ptable_format'] == "msdos": - if disk['realpart'] > 3: - part['type'] = 'logical' - part['num'] = disk['realpart'] + 1 + if len(self.partitions) > 4: + if disk['realpart'] > 3: + part['type'] = 'logical' + part['num'] = disk['realpart'] + 1 disk['partitions'].append(num) msger.debug("Assigned %s to %s%d, sectors range %d-%d size %d " @@ -292,7 +293,7 @@ class Image(): # even number of sectors. if part['mountpoint'] == "/boot" and part['fstype'] in ["vfat", "msdos"] \ and part['size'] % 2: - msger.debug("Substracting one sector from '%s' partition to " \ + msger.debug("Subtracting one sector from '%s' partition to " \ "get even number of sectors for the partition" % \ part['mountpoint']) part['size'] -= 1 |