Skip to content

POSIX sh compat #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jengelh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

POSIX sh compat #1062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6e973
mkbaselibs: generate POSIX sh compatible spec files
jengelh Feb 24, 2025
0ef6192
mkbaselibs: modernize generated specfiles and add sh quoting
jengelh Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions mkbaselibs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,58 +778,58 @@ sub handle_rpms {
print SPEC "%prep\n";
print SPEC "%build\n";
print SPEC "%install\n";
print SPEC "rm -rf \$RPM_BUILD_ROOT\n";
print SPEC "mkdir \$RPM_BUILD_ROOT\n";
print SPEC "cd \$RPM_BUILD_ROOT\n";
print SPEC "rm -Rf \"\%buildroot\"\n";
print SPEC "mkdir \"\%buildroot\"\n";
print SPEC "cd \"\%buildroot\"\n";
my @cfl = grep {!$cfiles{$_} && !$moves{$_}} sort keys %files;
if (@cfl) {
if ($prefix ne '') {
print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix\n";
print SPEC "pushd \$RPM_BUILD_ROOT$prefix\n";
print SPEC "mkdir -p \"\%buildroot/$prefix\"\n";
print SPEC "cd \"\%buildroot/$prefix\"\n";
}
print SPEC "cat <<EOFL >.filelist\n";
print SPEC "$_\n" for map {$cpiopre.substr($_, 1)} @cfl;
print SPEC "EOFL\n";
print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix$_\n" for sort keys %cpiodirs;
print SPEC "rpm2cpio $rpm | cpio -i -d -v -E .filelist\n";
print SPEC "mkdir -p \"\%buildroot/$prefix$_\"\n" for sort keys %cpiodirs;
print SPEC "rpm2cpio \"$rpm\" | cpio -i -d -v -E .filelist\n";
print SPEC "rm .filelist\n";
if (%ghosts) {
for my $fn (grep {$ghosts{$_}} @cfl) {
my $fnm = $fn;
$fnm = '.' unless $fnm =~ s/\/[^\/]+$//;
print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix$fnm\n";
print SPEC "touch \$RPM_BUILD_ROOT$prefix$fn\n";
print SPEC "mkdir -p \"\%buildroot/$prefix$fnm\"\n";
print SPEC "touch \"\%buildroot/$prefix$fn\"\n";
}
}
if ($prefix ne '') {
print SPEC "popd\n";
print SPEC "cd -\n";
}
}
if (%cfiles || %moves) {
print SPEC "mkdir -p .cfiles\n";
print SPEC "pushd .cfiles\n";
print SPEC "cd .cfiles\n";
print SPEC "cat <<EOFL >.filelist\n";
print SPEC "$_\n" for map {$cpiopre.substr($_, 1)} grep {$cfiles{$_} || $moves{$_}} sort keys %files;
print SPEC "EOFL\n";
print SPEC "rpm2cpio $rpm | cpio -i -d -v -E .filelist\n";
print SPEC "popd\n";
print SPEC "rpm2cpio \"$rpm\" | cpio -i -d -v -E .filelist\n";
print SPEC "cd -\n";
if (%cfiles) {
print SPEC "mkdir -p \$RPM_BUILD_ROOT$configdir\n";
print SPEC "mv .cfiles$_ \$RPM_BUILD_ROOT$configdir\n" for sort keys %cfiles;
print SPEC "mkdir -p \"\%buildroot/$configdir\"\n";
print SPEC "mv \".cfiles$_\" \"\%buildroot/$configdir\"\n" for sort keys %cfiles;
}
for my $fn (sort keys %moves) {
my $fnm = $moves{$fn};
$fnm = '.' unless $fnm =~ s/\/[^\/]+$//;
print SPEC "mkdir -p \$RPM_BUILD_ROOT$fnm\n";
print SPEC "mv .cfiles$fn \$RPM_BUILD_ROOT$moves{$fn}\n";
print SPEC "mkdir -p \"\%buildroot/$fnm\"\n";
print SPEC "mv \".cfiles$fn\" \"\%buildroot/$moves{$fn}\"\n";
}
print SPEC "rm -rf .cfiles\n";
}
for my $fn (sort keys %symlinks) {
my $fnm = $fn;
$fnm = '.' unless $fnm =~ s/\/[^\/]+$//;
print SPEC "mkdir -p \$RPM_BUILD_ROOT$fnm\n";
print SPEC "ln -s $symlinks{$fn} \$RPM_BUILD_ROOT$fn\n";
print SPEC "mkdir -p \"\%buidroot/$fnm\"\n";
print SPEC "ln -s \"$symlinks{$fn}\" \"\%buildroot/$fn\"\n";
}
if ($prefix ne '' && grep {/\.so.*$/} @cfl) {
@postin = () if @postin == 1 && $postin[0] =~ /^\"-p.*ldconfig/;
Expand Down