prepare-kernel: Only purge links from target directories

PATCH In review Jan Kiszka 3 participants 5 messages Jan 9, 2013 – Jan 13, 2013

Share & tools

Jan Kiszka

author

2013-01-09 13:47 UTC #0 lore raw

PATCH 1/1 prepare-kernel: Only purge links from target directories

Only remove files from the target directory of patch_link if they are missing in Xenomai AND are actually symbolic links. This is required when merging Xenomai directories into non-empty kernel dirs.

Signed-off-by Jan Kiszka <[email protected]>

---

This is not required for the current patch workload but helps us in 2.6 with integrating ftrace (we patch into include/trace/events there). Would reduce our queue length by one if this could be merged nevertheless.

 scripts/prepare-kernel.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

scripts/prepare-kernel.sh +1 -1

index 36f9a4a..5f4043a 100755
@@ -103,7 +103,7 @@ patch_link() {
 	    find . $recursive_opt \( $directorytype_opt \
                 $link_makefiles_opt -name $config_file -o -name '*.[chS]' \) |
             while read f; do
-                if test ! -e $xenomai_root/$target_dir/$f; then rm -Rf $f; fi
+                if test -L $f -a ! -e $xenomai_root/$target_dir/$f; then rm -Rf $f; fi
             done
         fi

Signature · 1 line

1.7.3.4

Gilles Chanteperdrix

2013-01-12 17:12 UTC #1 lore raw

Quoted 11 lines · Jan Kiszka

Only remove files from the target directory of patch_link if they are missing in Xenomai AND are actually symbolic links. This is required when merging Xenomai directories into non-empty kernel dirs.
Signed-off-by Jan Kiszka <[email protected]>
---
This is not required for the current patch workload but helps us in 2.6 with integrating ftrace (we patch into include/trace/events there). Would reduce our queue length by one if this could be merged nevertheless.

Despite the fact that it is a one-liner, I do not understand what this patch does, and I am not sure it is not going to break things.

Signature · 1 line

                                                                Gilles.

Jan Kiszka

2013-01-13 11:17 UTC #2 lore raw

Quoted 9 lines · Gilles Chanteperdrix

Quoted 7 lines · Jan Kiszka
Only remove files from the target directory of patch_link if they are missing in Xenomai AND are actually symbolic links. This is required when merging Xenomai directories into non-empty kernel dirs.
Signed-off-by Jan Kiszka <[email protected]>
---

Quoted 8 lines

Quoted 4 lines
This is not required for the current patch workload but helps us in 2.6 with integrating ftrace (we patch into include/trace/events there). Would reduce our queue length by one if this could be merged nevertheless.
Despite the fact that it is a one-liner, I do not understand what this patch does, and I am not sure it is not going to break things.

One way to install Xenomai into a kernel source tree is by adding symbolic links to the individual source files. In preparation of this step, the prepare-kernel script first purges all files from affected directories that are not present in the Xenomai sources (anymore). That works fine for our current Xenomai dirs as they are exclusively used but fails once we have to patch dirs that are also used by the original kernel (like the cited trace event dir).

This patch addresses the issue by only purging symbolic links, not regular files. We will also need it in forge once we add ftrace support over there.

HTH,
Jan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 261 bytes
Desc: OpenPGP digital signature
URL: <http://www.xenomai.org/pipermail/xenomai/attachments/20130113/ffd0ce13/attachment.pgp>

Gilles Chanteperdrix

2013-01-13 11:50 UTC #3 lore raw

Quoted 19 lines · Jan Kiszka

Quoted 9 lines · Gilles Chanteperdrix
Quoted 7 lines · Jan Kiszka
Only remove files from the target directory of patch_link if they are missing in Xenomai AND are actually symbolic links. This is required when merging Xenomai directories into non-empty kernel dirs.
Signed-off-by Jan Kiszka <[email protected]>
---
Quoted 8 lines
Quoted 4 lines
This is not required for the current patch workload but helps us in 2.6 with integrating ftrace (we patch into include/trace/events there). Would reduce our queue length by one if this could be merged nevertheless.
Despite the fact that it is a one-liner, I do not understand what this patch does, and I am not sure it is not going to break things.

Quoted 7 lines

One way to install Xenomai into a kernel source tree is by adding symbolic links to the individual source files. In preparation of this step, the prepare-kernel script first purges all files from affected directories that are not present in the Xenomai sources (anymore). That works fine for our current Xenomai dirs as they are exclusively used but fails once we have to patch dirs that are also used by the original kernel (like the cited trace event dir).

The thing I do not understand is why Xenomai would patch the trace event dir? This is the I-pipe's job.

Signature · 1 line

                                                                Gilles.

Jan Kiszka

2013-01-13 11:54 UTC #4 lore raw

Quoted 30 lines · Gilles Chanteperdrix

Quoted 19 lines · Jan Kiszka
Quoted 9 lines · Gilles Chanteperdrix
Quoted 7 lines · Jan Kiszka
Only remove files from the target directory of patch_link if they are missing in Xenomai AND are actually symbolic links. This is required when merging Xenomai directories into non-empty kernel dirs.
Signed-off-by Jan Kiszka <[email protected]>
---
Quoted 8 lines
Quoted 4 lines
This is not required for the current patch workload but helps us in 2.6 with integrating ftrace (we patch into include/trace/events there). Would reduce our queue length by one if this could be merged nevertheless.
Despite the fact that it is a one-liner, I do not understand what this patch does, and I am not sure it is not going to break things.
Quoted 7 lines
One way to install Xenomai into a kernel source tree is by adding symbolic links to the individual source files. In preparation of this step, the prepare-kernel script first purges all files from affected directories that are not present in the Xenomai sources (anymore). That works fine for our current Xenomai dirs as they are exclusively used but fails once we have to patch dirs that are also used by the original kernel (like the cited trace event dir).

Quoted 2 lines

The thing I do not understand is why Xenomai would patch the trace event dir? This is the I-pipe's job.

Xenomai has to deliver its own trace event headers to be recognized by ftrace, see e.g. my old ftrace patch:
http://git.xenomai.org/?p=xenomai-jki.git;a=commitdiff;h=66c011b0de4cc4bd0bc50b521308aad13f53ec21

Jan