[cip-dev][isar-cip-core][PATCH 0/2] Minor Fixes

[cip-dev][isar-cip-core][PATCH 0/2] Minor Fixes

[Quirin Gylstorff]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Add __pycache__ to gitignore
correct syntax in initramfs-config

Quirin Gylstorff (2):
  initramfs-config: use correct syntax for FILESPATH
  add pycache to .gitignore

 .gitignore                                                      | 1 +
 .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.20.1


[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5950): https://lists.cip-project.org/g/cip-dev/message/5950
Mute This Topic: https://lists.cip-project.org/mt/78879161/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 1/2] initramfs-config: use correct syntax for FILESPATH

[Quirin Gylstorff]

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

replace the incorrect usage.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
index 4243b41..68d064f 100644
--- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
+++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
@@ -10,7 +10,7 @@
 
 require recipes-support/initramfs-config/initramfs-config.inc
 
-FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
+FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
 
 DEBIAN_DEPENDS += ", busybox, patch"
 
-- 
2.20.1


[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5952): https://lists.cip-project.org/g/cip-dev/message/5952
Mute This Topic: https://lists.cip-project.org/mt/78879163/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 2/2] add pycache to .gitignore

[Quirin Gylstorff]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

If a project derives from isar-cip-core and needs to patch isar-cip-core
the patching fails after a build as the repository is dirty. Fix by
ignoring the pycache directory.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5142933..b73840f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build/
 isar/
 kas-docker
 kas-container
+__pycache__
-- 
2.20.1


[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5951): https://lists.cip-project.org/g/cip-dev/message/5951
Mute This Topic: https://lists.cip-project.org/mt/78879162/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH 1/2] initramfs-config: use correct syntax for FILESPATH

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]

On 11.12.20 14:54, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> replace the incorrect usage.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb       | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> index 4243b41..68d064f 100644
> --- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> +++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> @@ -10,7 +10,7 @@
>  
>  require recipes-support/initramfs-config/initramfs-config.inc
>  
> -FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
> +FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
>  

"files" is in the default search path of every recipe - just drop that
line I would say.

Jan

>  DEBIAN_DEPENDS += ", busybox, patch"
>  
> 

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5958): https://lists.cip-project.org/g/cip-dev/message/5958
Mute This Topic: https://lists.cip-project.org/mt/78879163/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH 2/2] add pycache to .gitignore

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

On 11.12.20 14:54, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> If a project derives from isar-cip-core and needs to patch isar-cip-core
> the patching fails after a build as the repository is dirty. Fix by
> ignoring the pycache directory.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.gitignore b/.gitignore
> index 5142933..b73840f 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -2,3 +2,4 @@ build/
>  isar/
>  kas-docker
>  kas-container
> +__pycache__
> 

Thanks, applied.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5959): https://lists.cip-project.org/g/cip-dev/message/5959
Mute This Topic: https://lists.cip-project.org/mt/78879162/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH v2] initramfs-config: use correct syntax for FILESPATH

[Quirin Gylstorff]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

replace the incorrect usage.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
index 4243b41..3322d71 100644
--- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
+++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
@@ -10,7 +10,7 @@
 
 require recipes-support/initramfs-config/initramfs-config.inc
 
-FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
+FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}:"
 
 DEBIAN_DEPENDS += ", busybox, patch"
 
-- 
2.20.1


[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5960): https://lists.cip-project.org/g/cip-dev/message/5960
Mute This Topic: https://lists.cip-project.org/mt/78947110/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH v2] initramfs-config: use correct syntax for FILESPATH

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]

On 14.12.20 10:22, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> replace the incorrect usage.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb       | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> index 4243b41..3322d71 100644
> --- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> +++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> @@ -10,7 +10,7 @@
>  
>  require recipes-support/initramfs-config/initramfs-config.inc
>  
> -FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
> +FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}:"
>  

Why that? Just remove FILESPATH, do not add anything, and it should
still work.

Jan

>  DEBIAN_DEPENDS += ", busybox, patch"
>  
> 


-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5962): https://lists.cip-project.org/g/cip-dev/message/5962
Mute This Topic: https://lists.cip-project.org/mt/78947110/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH v3] initramfs-config: remove FILESPATH

[Quirin Gylstorff]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

The file patch is wrong and not necessary.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
index 4243b41..a5e09a2 100644
--- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
+++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
@@ -10,7 +10,6 @@
 
 require recipes-support/initramfs-config/initramfs-config.inc
 
-FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
 
 DEBIAN_DEPENDS += ", busybox, patch"
 
-- 
2.20.1


[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5964): https://lists.cip-project.org/g/cip-dev/message/5964
Mute This Topic: https://lists.cip-project.org/mt/78947302/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH v3] initramfs-config: remove FILESPATH

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

On 14.12.20 10:45, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> The file patch is wrong and not necessary.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .../initramfs-config/initramfs-abrootfs-secureboot_0.1.bb        | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> index 4243b41..a5e09a2 100644
> --- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> +++ b/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
> @@ -10,7 +10,6 @@
>  
>  require recipes-support/initramfs-config/initramfs-config.inc
>  
> -FILESPATH =. "${LAYERDIR_isar-siemens}/recipes-support/initramfs-config/files:"
>  
>  DEBIAN_DEPENDS += ", busybox, patch"
>  
> 

Thanks, applied (with extra blank line removal).

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 420 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5965): https://lists.cip-project.org/g/cip-dev/message/5965
Mute This Topic: https://lists.cip-project.org/mt/78947302/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-