Skip to content

Commit 3047a25

Browse files
(PA-6350) Enable agent-runtime main builds for fedora 40 Intel
- Add Fedora 40 (Intel) platform definition file - Patch swig generated interface patch for Fedora 40 - Apply ruby-augeas patch to remove unused sibling parameter for all platforms using building ruby-augeas. It breaks Fedora 40 and generates a warning for other platforms.
1 parent c7b0307 commit 3047a25

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

configs/components/_base-ruby-augeas.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#
55

66
pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_c_extension.patch")
7+
pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_remove_unused_parameter.patch")
78

89
# These can be overridden by the including component.
910
ruby_version ||= settings[:ruby_version]
@@ -75,6 +76,7 @@
7576
if ruby_version =~ /^3/
7677
build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_c_extension.patch"
7778
end
79+
build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_remove_unused_parameter.patch"
7880
build_commands << "#{ruby} ext/augeas/extconf.rb"
7981
build_commands << "#{platform[:make]} -e -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"
8082

configs/components/_base-ruby-selinux.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
if ruby_version =~ /^3/
8080
# swig 4.1 generated interface does not need patching
81-
unless platform.name =~ /^(debian-12|ubuntu-24)/
81+
unless platform.name =~ /^(debian-12|ubuntu-24|fedora-40)/
8282
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch"
8383
end
8484
end
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
platform 'fedora-40-x86_64' do |plat|
2+
plat.inherit_from_default
3+
end
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/ext/augeas/_augeas.c b/ext/augeas/_augeas.c
2+
index f9b49d1..7ef0d7d 100644
3+
--- a/ruby-augeas-0.5.0/ext/augeas/_augeas.c
4+
+++ b/ruby-augeas-0.5.0/ext/augeas/_augeas.c
5+
@@ -184,7 +184,7 @@ VALUE augeas_mv(VALUE s, VALUE src, VALUE dst) {
6+
*
7+
* Remove path and all its children. Returns the number of entries removed
8+
*/
9+
-VALUE augeas_rm(VALUE s, VALUE path, VALUE sibling) {
10+
+VALUE augeas_rm(VALUE s, VALUE path) {
11+
augeas *aug = aug_handle(s);
12+
const char *cpath = StringValueCStr(path) ;

0 commit comments

Comments
 (0)