Skip to content

Commit

Permalink
phase1: correctly exclude kmods files from rsync target upload and prune
Browse files Browse the repository at this point in the history 
There is currently a BUG in the --exclude pattern for the targetupload step.
The /kmods/ directory is actually never excluded. This was never notice
as the rsynclist never actually had kmods entry as make checksum step
was done before moving the kmods to the dedicated directory.

This is caused by the fact that with --files-from, not only the /kmods/
directory needs to be excluded but also every content in it, hence the
additional --exclude "/kmods/**" is required to correcly skip the entry
present in rsynclist.

Signed-off-by: Christian Marangi <[email protected]>
  • Loading branch information
@Ansuel @ynezz
Ansuel authored and ynezz committed Nov 18, 2024
1 parent 9f22657 commit a75ce02
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions phase1/master.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1664,6 +1664,7 @@ def prepareFactory(target):
command=[
"../rsync.sh",
"--exclude=/kmods/",
"--exclude=/kmods/**",
"--files-from=rsynclist",
"--delay-updates",
"--partial-dir=.~tmp~%s~%s" % (target, subtarget),
Expand Down

6 comments on commit a75ce02

@efahl
Copy link

@efahl efahl commented on a75ce02 Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ansuel I'm assuming this is the change that caused me to report the "missing kmods in package index" openwrt/openwrt#17036 that @ynezz fixed in openwrt/openwrt#17042

Do you know how far back will this reach? That #17042 fix was applied to snapshots and 24.10 where it's working fine, but I was just testing owut against 23.05-SNAPSHOT and noticed that "missing kmods" is appearing there now.

https://downloads.openwrt.org/releases/23.05-SNAPSHOT/targets/x86/64/packages/index.json << no kmods indexed, but 23.05.5 has them (maybe only until its next package build???)

@efahl
Copy link

@efahl efahl commented on a75ce02 Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I should add, this is extremely low priority, as downgrading to pre-24.10 with owut is possible, but very experimental and not recommended.

@ynezz
Copy link
Member

@ynezz ynezz commented on a75ce02 Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

23.05, 24.10 and main branches are being built using the same buildbot instance, so they share the behavior, thus we need to backport this changes into 23.05 as well openwrt/openwrt#17102
23.05.5 is not affected, because its a release, but 23.05.6 would be affected (in a same way as current 23.05-SNAPSHOTS)

@efahl
Copy link

@efahl efahl commented on a75ce02 Nov 29, 2024 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ansuel
Copy link
Member Author

@Ansuel Ansuel commented on a75ce02 Nov 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@efahl commit backported to 23.05

@efahl
Copy link

@efahl efahl commented on a75ce02 Nov 29, 2024 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.