packages/boulder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c6ce882fcd
boulder/patch.patch

530 lines
19 KiB
Diff
Raw Blame History

diff --git a/boulder/data/macros/actions/cmake.yml b/boulder/data/macros/actions/cmake.yml
index 93b3068..a6d47f1 100644
--- a/boulder/data/macros/actions/cmake.yml
+++ b/boulder/data/macros/actions/cmake.yml
@@ -47,6 +47,6 @@ definitions:
-DCMAKE_CXX_FLAGS_RELEASE="" \
-DCMAKE_LD_FLAGS="${LDFLAGS}" \
-DCMAKE_BUILD_TYPE="Release" \
- -DCMAKE_INSTALL_LIBDIR="lib" \
+ -DCMAKE_INSTALL_LIBDIR="lib%(libsuffix)" \
-DCMAKE_INSTALL_PREFIX="%(prefix)" \
-DCMAKE_LIB_SUFFIX="%(libsuffix)"
diff --git a/boulder/data/macros/actions/meson.yml b/boulder/data/macros/actions/meson.yml
index f0390bd..29d4cbb 100644
--- a/boulder/data/macros/actions/meson.yml
+++ b/boulder/data/macros/actions/meson.yml
@@ -42,8 +42,8 @@ definitions:
- options_meson: |
--prefix="%(prefix)" \
--buildtype="plain" \
- --libdir="lib%(libsuffix)" \
- --libexecdir="lib%(libsuffix)/%(name)" \
+ --libdir="%(libdir)" \
+ --libexecdir="%(libexecdir)" \
--sysconfdir="%(sysconfdir)" \
--localstatedir="%(localstatedir)" \
"%(builddir)"
diff --git a/boulder/data/macros/arch/base.yml b/boulder/data/macros/arch/base.yml
index 6a62e13..21e1279 100644
--- a/boulder/data/macros/arch/base.yml
+++ b/boulder/data/macros/arch/base.yml
@@ -3,7 +3,7 @@
definitions:
# Basic variables required for packages to build correctly
- - libsuffix : ""
+ - libsuffix : "64"
- prefix : "/usr"
- bindir : "%(prefix)/bin"
- sbindir : "%(prefix)/sbin"
@@ -23,12 +23,12 @@ definitions:
- runstatedir : "/run"
- sysconfdir : "/etc"
- libdir : "%(prefix)/lib%(libsuffix)"
- - libexecdir : "%(libdir)/%(name)"
- - builddir : "serpent_builddir"
+ - libexecdir : "%(prefix)/libexec"
+ - builddir : "future_builddir"
# The vendorID is encoded into the triplet, toolchain, builds, etc.
# It must match the triplet from bootstrap-scripts.
- - vendorID : "serpent-linux"
+ - vendorID : "future-linux"
# Must be set for CC/CXX/CPP to work
- cc : "%(compiler_c)"
@@ -549,10 +549,10 @@ packages :
the %(name) package.
paths:
- /usr/include
- - /usr/lib/*.a
- - /usr/lib/cmake
- - /usr/lib/lib*.so
- - /usr/lib/pkgconfig
+ - /usr/lib64/*.a
+ - /usr/lib64/cmake
+ - /usr/lib64/lib*.so
+ - /usr/lib64/pkgconfig
- /usr/share/aclocal
- /usr/share/man/man2
- /usr/share/man/man3
@@ -568,7 +568,7 @@ packages :
Install this package if you need debugging information + symbols
for the %(name) package.
paths:
- - /usr/lib/debug
+ - /usr/lib64/debug
# Template for a -libs sub-package which can be used by adding paths via the stone.yml file
- "%(name)-libs":
diff --git a/boulder/data/macros/arch/emul32/x86_64.yml b/boulder/data/macros/arch/emul32/x86_64.yml
index e065dc4..6c0c7ac 100644
--- a/boulder/data/macros/arch/emul32/x86_64.yml
+++ b/boulder/data/macros/arch/emul32/x86_64.yml
@@ -11,7 +11,7 @@ definitions:
- march : i686
- mtune : i686
- target_triple : "i686-unknown-linux-gnu"
- - pkgconfigpath : "%(libdir)/pkgconfig:/usr/share/pkgconfig:%(prefix)/lib/pkgconfig"
+ - pkgconfigpath : "%(libdir)/pkgconfig:/usr/share/pkgconfig:%(prefix)/lib32/pkgconfig"
flags:
diff --git a/boulder/data/macros/arch/x86_64-stage1.yml b/boulder/data/macros/arch/x86_64-stage1.yml
index dfb87a2..497f626 100644
--- a/boulder/data/macros/arch/x86_64-stage1.yml
+++ b/boulder/data/macros/arch/x86_64-stage1.yml
@@ -7,14 +7,14 @@
definitions:
- prefix : "/usr/bootstrap-stage1"
- - libsuffix : ""
+ - libsuffix : "64"
- build_platform : x86_64-linux-gnu
- host_platform : x86_64-%(vendorID)
- cc : "%(compiler_c)"
- cxx : "%(compiler_cxx)"
- cpp : "%(compiler_cpp)"
- march : x86-64-v2
- - mtune : ivybridge
+ - mtune : generic
- target_triple : "x86_64-unknown-linux-gnu"
- bootstrap_root : /bill
@@ -22,8 +22,8 @@ flags:
# Set architecture flags
- architecture:
- c : "-march=x86-64-v2 -mtune=ivybridge"
- cxx : "-march=x86-64-v2 -mtune=ivybridge"
+ c : "-march=x86-64-v2 -mtune=generic"
+ cxx : "-march=x86-64-v2 -mtune=generic"
defaultTuningGroups :
- base
diff --git a/boulder/data/macros/arch/x86_64-v3x.yml b/boulder/data/macros/arch/x86_64-v3x.yml
index 34c9c43..d50d305 100644
--- a/boulder/data/macros/arch/x86_64-v3x.yml
+++ b/boulder/data/macros/arch/x86_64-v3x.yml
@@ -2,19 +2,19 @@
definitions:
- - libsuffix : ""
+ - libsuffix : "64"
- build_platform : x86_64-%(vendorID)
- host_platform : x86_64-%(vendorID)
- cc : "%(compiler_c)"
- cxx : "%(compiler_cxx)"
- cpp : "%(compiler_cpp)"
- march : x86-64-v3
- - mtune : znver1
+ - mtune : haswell
flags:
# Set architecture flags (GCC)
- architecture:
- c : "-march=x86-64-v3 -mtune=znver1 -maes -mfsgsbase -mpclmul -mrdrnd -maes -mxsaveopt"
- cxx : "-march=x86-64-v3 -mtune=znver1 -maes -mfsgsbase -mpclmul -mrdrnd -maes -mxsaveopt"
+ c : "-march=x86-64-v3 -mtune=haswell -maes -mfsgsbase -mpclmul -mrdrnd -maes -mxsaveopt"
+ cxx : "-march=x86-64-v3 -mtune=haswell -maes -mfsgsbase -mpclmul -mrdrnd -maes -mxsaveopt"
diff --git a/boulder/data/macros/arch/x86_64.yml b/boulder/data/macros/arch/x86_64.yml
index 62338b0..c661642 100644
--- a/boulder/data/macros/arch/x86_64.yml
+++ b/boulder/data/macros/arch/x86_64.yml
@@ -2,7 +2,7 @@
definitions:
- - libsuffix : ""
+ - libsuffix : "64"
- build_platform : x86_64-%(vendorID)
- host_platform : x86_64-%(vendorID)
- cc : "%(compiler_c)"
@@ -10,13 +10,13 @@ definitions:
- cpp : "%(compiler_cpp)"
- d : "%(compiler_d)"
- march : x86-64-v2
- - mtune : ivybridge
+ - mtune : generic
- target_triple : "x86_64-unknown-linux-gnu"
flags:
# Set architecture flags
- architecture:
- c : "-march=x86-64-v2 -mtune=ivybridge"
- cxx : "-march=x86-64-v2 -mtune=ivybridge"
+ c : "-march=x86-64-v2 -mtune=generic"
+ cxx : "-march=x86-64-v2 -mtune=generic"
d : "-mcpu=x86-64-v2"
diff --git a/boulder/data/profile.d/default-x86_64.yaml b/boulder/data/profile.d/default-x86_64.yaml
index fe519ec..ada2689 100644
--- a/boulder/data/profile.d/default-x86_64.yaml
+++ b/boulder/data/profile.d/default-x86_64.yaml
@@ -1,13 +1,13 @@
default-x86_64:
repositories:
volatile:
- uri: "https://dev.serpentos.com/volatile/x86_64/stone.index"
+ uri: "http://192.168.0.117/futurelinux/moss/stone.index"
description: "Volatile moss repo"
priority: 0
local-x86_64:
repositories:
volatile:
- uri: "https://dev.serpentos.com/volatile/x86_64/stone.index"
+ uri: "http://192.168.0.117/futurelinux/moss/stone.index"
description: "Volatile moss repo"
priority: 0
local:
diff --git a/boulder/data/recipeTemplate.yml b/boulder/data/recipeTemplate.yml
index 238a45a..0644275 100644
--- a/boulder/data/recipeTemplate.yml
+++ b/boulder/data/recipeTemplate.yml
@@ -1,5 +1,5 @@
#
-# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
+# SPDX-FileCopyrightText: © 2020-2024 Future Linux Developers
#
# SPDX-License-Identifier: MPL-2.0
#
diff --git a/boulder/src/build/job/phase.rs b/boulder/src/build/job/phase.rs
index 79d8e10..f4b834f 100644
--- a/boulder/src/build/job/phase.rs
+++ b/boulder/src/build/job/phase.rs
@@ -151,7 +151,7 @@ impl Phase {
parser.add_definition("compiler_cache", "/mason/ccache");
let path = if ccache {
- "/usr/lib/ccache/bin:/usr/bin:/bin"
+ "/usr/lib64/ccache/bin:/usr/bin:/bin"
} else {
"/usr/bin:/bin"
};
diff --git a/boulder/src/draft/build/cargo.rs b/boulder/src/draft/build/cargo.rs
index bbf3f23..971f612 100644
--- a/boulder/src/draft/build/cargo.rs
+++ b/boulder/src/draft/build/cargo.rs
@@ -5,7 +5,7 @@ use crate::draft::build::{Error, Phases, State};
use crate::draft::File;
pub fn environment() -> &'static str {
- "export HOME=$(pwd)\n export CARGO_HTTP_CAINFO=/usr/share/defaults/etc/ssl/certs/ca-certificates.crt"
+ "export HOME=$(pwd)\n export CARGO_HTTP_CAINFO=/etc/ssl/certs/ca-certificates.crt"
}
pub fn phases() -> Phases {
diff --git a/boulder/src/package/analysis/handler.rs b/boulder/src/package/analysis/handler.rs
index b6d11c0..4218fcd 100644
--- a/boulder/src/package/analysis/handler.rs
+++ b/boulder/src/package/analysis/handler.rs
@@ -23,7 +23,7 @@ pub fn ignore_blocked(_bucket: &mut BucketMut, info: &mut PathInfo) -> Result<Re
}
// libtool files break the world
- if info.file_name().ends_with(".la") && info.target_path.starts_with("/usr/lib") {
+ if info.file_name().ends_with(".la") && info.target_path.starts_with("/usr/lib64") {
return Ok(Decision::IgnoreFile {
reason: "libtool file".into(),
}
@@ -80,9 +80,9 @@ pub fn pkg_config(bucket: &mut BucketMut, info: &mut PathInfo) -> Result<Respons
(
"PKG_CONFIG_PATH",
if emul32 {
- "/usr/lib32/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig"
+ "/usr/lib32/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig"
} else {
- "/usr/lib/pkgconfig:/usr/share/pkgconfig"
+ "/usr/lib64/pkgconfig:/usr/share/pkgconfig"
},
),
])
diff --git a/boulder/src/package/analysis/handler/elf.rs b/boulder/src/package/analysis/handler/elf.rs
index 7eea0b4..ac8100d 100644
--- a/boulder/src/package/analysis/handler/elf.rs
+++ b/boulder/src/package/analysis/handler/elf.rs
@@ -147,14 +147,12 @@ fn parse_dynamic_section(
[
format!("/usr/lib64/{soname}({machine_isa})"),
format!("/lib64/{soname}({machine_isa})"),
- format!("/lib/{soname}({machine_isa})"),
format!("{}({machine_isa})", info.target_path.display()),
]
} else {
[
- format!("/usr/lib/{soname}({machine_isa})"),
+ format!("/usr/lib32/{soname}({machine_isa})"),
format!("/lib32/{soname}({machine_isa})"),
- format!("/lib/{soname}({machine_isa})"),
format!("{}({machine_isa})", info.target_path.display()),
]
};
@@ -219,7 +217,7 @@ fn split_debug(
};
let debug_dir = if matches!(bit_size, Class::ELF64) {
- Path::new("usr/lib/debug/.build-id")
+ Path::new("usr/lib64/debug/.build-id")
} else {
Path::new("usr/lib32/debug/.build-id")
};
diff --git a/moss/src/client/mod.rs b/moss/src/client/mod.rs
index 8e86102..0490ec2 100644
--- a/moss/src/client/mod.rs
+++ b/moss/src/client/mod.rs
@@ -699,7 +699,7 @@ fn create_root_links(root: &Path) -> Result<(), io::Error> {
("usr/sbin", "sbin"),
("usr/bin", "bin"),
("usr/lib", "lib"),
- ("usr/lib", "lib64"),
+ ("usr/lib64", "lib64"),
("usr/lib32", "lib32"),
];
@@ -724,15 +724,15 @@ fn create_root_links(root: &Path) -> Result<(), io::Error> {
/// Record the operating system release info
fn record_os_release(root: &Path, state_id: Option<state::Id>) -> Result<(), Error> {
let os_release = format!(
- r#"NAME="Serpent OS"
+ r#"NAME="Future Linux"
VERSION="{version}"
-ID="serpentos"
+ID="futurelinux"
VERSION_CODENAME={version}
VERSION_ID="{version}"
-PRETTY_NAME="Serpent OS {version} (fstx #{tx})"
+PRETTY_NAME="Future Linux {version} (fstx #{tx})"
ANSI_COLOR="1;35"
-HOME_URL="https://serpentos.com"
-BUG_REPORT_URL="https://github.com/serpent-os""#,
+HOME_URL="https://futurelinux.xyz"
+BUG_REPORT_URL="http://xhaa123.51mypc.cn:33665""#,
version = environment::VERSION,
// TODO: Better id for ephemeral transactions
tx = state_id.unwrap_or_default()
diff --git a/test/base.yml b/test/base.yml
index 9970399..181ed58 100644
--- a/test/base.yml
+++ b/test/base.yml
@@ -3,7 +3,7 @@
definitions:
# Basic variables required for packages to build correctly
- - libsuffix : ""
+ - libsuffix : "64"
- prefix : "/usr"
- bindir : "%(prefix)/bin"
- sbindir : "%(prefix)/sbin"
@@ -23,12 +23,12 @@ definitions:
- runstatedir : "/run"
- sysconfdir : "/etc"
- libdir : "%(prefix)/lib%(libsuffix)"
- - libexecdir : "%(libdir)/%(name)"
- - builddir : "serpent_builddir"
+ - libexecdir : "%(prefix)/libexec"
+ - builddir : "future_builddir"
# The vendorID is encoded into the triplet, toolchain, builds, etc.
# It must match the triplet from bootstrap-scripts.
- - vendorID : "serpent-linux"
+ - vendorID : "future-linux"
# Must be set for CC/CXX/CPP to work
- cc : "%(compiler_c)"
@@ -524,10 +524,10 @@ packages :
the %(name) package.
paths:
- /usr/include
- - /usr/lib/*.a
- - /usr/lib/cmake
- - /usr/lib/lib*.so
- - /usr/lib/pkgconfig
+ - /usr/lib64/*.a
+ - /usr/lib64/cmake
+ - /usr/lib64/lib*.so
+ - /usr/lib64/pkgconfig
- /usr/share/aclocal
- /usr/share/man/man2
- /usr/share/man/man3
@@ -543,7 +543,7 @@ packages :
Install this package if you need debugging information + symbols
for the %(name) package.
paths:
- - /usr/lib/debug
+ - /usr/lib64/debug
# Template for a -libs sub-package which can be used by adding paths via the stone.yml file
- "%(name)-libs":
diff --git a/test/cmake.yml b/test/cmake.yml
index ca58ca5..54214ef 100644
--- a/test/cmake.yml
+++ b/test/cmake.yml
@@ -39,6 +39,6 @@ definitions:
-DCMAKE_CXX_FLAGS_RELEASE="" \
-DCMAKE_LD_FLAGS="${LDFLAGS}" \
-DCMAKE_BUILD_TYPE="Release" \
- -DCMAKE_INSTALL_LIBDIR="lib" \
+ -DCMAKE_INSTALL_LIBDIR="lib%(libsuffix)" \
-DCMAKE_INSTALL_PREFIX="%(prefix)" \
-DCMAKE_LIB_SUFFIX="%(libsuffix)"
diff --git a/test/llvm-stone.yml b/test/llvm-stone.yml
index b2f0dc7..9f27a6d 100644
--- a/test/llvm-stone.yml
+++ b/test/llvm-stone.yml
@@ -59,7 +59,7 @@ environment : |
"
# Without RPATH, we need help finding the right libraries to use
- export LD_LIBRARY_PATH="%(workdir)/%(builddir)/lib"
+ export LD_LIBRARY_PATH="%(workdir)/%(builddir)/usr/lib64"
setup : |
unset LD_PRELOAD
%patch %(pkgdir)/serpent/0001-Support-serpent-as-a-distro.patch
@@ -90,7 +90,7 @@ install : |
# Major clang version
major_version=$(echo %(version) | cut -d. -f1)
export PATH="%(workdir)/%(builddir)/bin:${PATH}"
- export LD_LIBRARY_PATH="%(workdir)/%(builddir)/lib:${LD_LIBRARY_PATH}"
+ export LD_LIBRARY_PATH="%(workdir)/%(builddir)/usr/lib64:${LD_LIBRARY_PATH}"
%bolt_instr %(workdir)/%(builddir)/bin/clang-${major_version}
%cmake -G Ninja ${llvmopts} -B bolt-clang -S runtimes \
@@ -127,7 +127,7 @@ packages :
description: |
Library files for %(name), typically pulled in as a dependency of another package.
paths:
- - /usr/lib/libLLVM-*.so
+ - /usr/lib64/libLLVM-*.so
- "%(name)-devel":
paths:
@@ -158,11 +158,11 @@ packages :
- /usr/bin/hmaptool
- /usr/bin/intercept-build
- /usr/bin/scan-*
- - /usr/lib/clang/*/bin
- - /usr/lib/clang/*/include
- - /usr/lib/clang/*/lib/linux/*x86_64*
- - /usr/lib/clang/*/share
- - /usr/lib/libear
+ - /usr/lib64/clang/*/bin
+ - /usr/lib64/clang/*/include
+ - /usr/lib64/clang/*/lib/linux/*x86_64*
+ - /usr/lib64/clang/*/share
+ - /usr/lib64/libear
- /usr/libexec
- /usr/share/clang
- /usr/share/man
@@ -173,7 +173,7 @@ packages :
description: |
Library files for clang, typically pulled in as a dependency of another package.
paths:
- - /usr/lib/libclang*.so.*
+ - /usr/lib64/libclang*.so.*
- "clang-devel":
summary: "Development files for clang"
@@ -181,9 +181,9 @@ packages :
Install this package if you intend to build software against
the clang package.
paths:
- - /usr/lib/cmake/clang
- - /usr/lib/libclang*.so
- - /usr/lib/libclang*.a
+ - /usr/lib64/cmake/clang
+ - /usr/lib64/libclang*.so
+ - /usr/lib64/libclang*.a
- /usr/include/clang*
rundeps:
- clang
@@ -194,7 +194,7 @@ packages :
Install this package if you need the 32-bit versions of the
clang package libraries.
paths:
- - /usr/lib/clang/*/lib/linux/*i386*
+ - /usr/lib32/clang/*/lib/linux/*i386*
- "lld":
summary: "Clang compiler front-end (LLVM)"
@@ -210,7 +210,7 @@ packages :
Install this package if you intend to build software against
the lld package.
paths:
- - /usr/lib/cmake/lld
- - /usr/lib/liblld*.a
+ - /usr/lib64/cmake/lld
+ - /usr/lib64/liblld*.a
rundeps:
- lld
diff --git a/test/trigger.yml b/test/trigger.yml
index c98be41..dd491ed 100644
--- a/test/trigger.yml
+++ b/test/trigger.yml
@@ -22,7 +22,7 @@ handlers:
args: ["-q", "-t", "rsa", "-f", "/etc/ssh/ssh_host_rsa_key", "-C", "-N"]
depmod:
- run: /sbin/depmod
+ run: /usr/sbin/depmod
args: ["-a", "$(version)"]
# Link paths to handlers and filter on the type
@@ -30,4 +30,4 @@ paths:
"/usr/lib/modules/(version:*)/kernel" :
handlers:
- depmod
- type: directory
\ No newline at end of file
+ type: directory
diff --git a/test/x86_64.yml b/test/x86_64.yml
index 7e812f8..efa36c6 100644
--- a/test/x86_64.yml
+++ b/test/x86_64.yml
@@ -2,18 +2,18 @@
definitions:
- - libsuffix : ""
+ - libsuffix : "64"
- build_platform : x86_64-%(vendorID)
- host_platform : x86_64-%(vendorID)
- cc : "%(compiler_c)"
- cxx : "%(compiler_cxx)"
- cpp : "%(compiler_cpp)"
- march : x86-64-v2
- - mtune : ivybridge
+ - mtune : generic
flags:
# Set architecture flags
- architecture:
- c : "-march=x86-64-v2 -mtune=ivybridge"
- cxx : "-march=x86-64-v2 -mtune=ivybridge"
+ c : "-march=x86-64-v2 -mtune=generic"
+ cxx : "-march=x86-64-v2 -mtune=generic"
Reference in New Issue View Git Blame Copy Permalink