Skip to content

Breaking: Do not include package name in lib artifact paths #564

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

Merged
cpuguy83 merged 1 commit into from
Mar 13, 2025
Merged

Breaking: Do not include package name in lib artifact paths #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packaging/linux/deb/debroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func fixupArtifactPerms(spec *dalec.Spec, target string, cfg *SourcePkgConfig) [
checkAndWritePerms(artifacts.Headers, HeadersPath)
checkAndWritePerms(artifacts.Licenses, filepath.Join(LicensesPath, spec.Name))
checkAndWritePerms(artifacts.Docs, filepath.Join(DocsPath, spec.Name))
checkAndWritePerms(artifacts.Libs, filepath.Join(LibsPath, spec.Name))
checkAndWritePerms(artifacts.Libs, filepath.Join(LibsPath))
checkAndWritePerms(artifacts.Libexec, LibexecPath)
checkAndWritePerms(artifacts.DataDirs, DataDirsPath)

Expand Down Expand Up @@ -583,7 +583,7 @@ func createInstallScripts(worker llb.State, spec *dalec.Spec, dir, target string
for _, key := range sorted {
cfg := artifacts.Libs[key]
resolved := cfg.ResolveName(key)
writeInstall(key, filepath.Join(LibsPath, spec.Name, cfg.SubPath), resolved)
writeInstall(key, filepath.Join(LibsPath, cfg.SubPath), resolved)
}
}

Expand Down
4 changes: 2 additions & 2 deletions packaging/linux/rpm/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ func (w *specWrapper) Install() fmt.Stringer {
libs := dalec.SortMapKeys(artifacts.Libs)
for _, l := range libs {
cfg := artifacts.Libs[l]
root := filepath.Join(`%{buildroot}/%{_libdir}`, w.Name)
root := filepath.Join(`%{buildroot}/%{_libdir}`)
copyArtifact(root, l, &cfg)
}

Expand Down Expand Up @@ -756,7 +756,7 @@ func (w *specWrapper) Files() fmt.Stringer {
libKeys := dalec.SortMapKeys(artifacts.Libs)
for _, l := range libKeys {
cfg := artifacts.Libs[l]
path := filepath.Join(`%{_libdir}`, w.Name, cfg.SubPath, cfg.ResolveName(l))
path := filepath.Join(`%{_libdir}`, cfg.SubPath, cfg.ResolveName(l))
fmt.Fprintln(b, path)
}

Expand Down
14 changes: 7 additions & 7 deletions test/linux_target_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,10 +1812,10 @@ func testLinuxLibArtirfacts(ctx context.Context, t *testing.T, cfg testLinuxConf
{
Name: "Check that lib files exist under package dir",
Files: map[string]dalec.FileCheckOutput{
filepath.Join(libDir, "test-library-files/lib1"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib1"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib1",
}},
filepath.Join(libDir, "test-library-files/lib2"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib2"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib2",
}},
},
Expand Down Expand Up @@ -1867,10 +1867,10 @@ func testLinuxLibArtirfacts(ctx context.Context, t *testing.T, cfg testLinuxConf
{
Name: "Check that lib files exist under package dir",
Files: map[string]dalec.FileCheckOutput{
filepath.Join(libDir, "test-library-files/lib1"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib1"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib1",
}},
filepath.Join(libDir, "test-library-files/lib2"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib2"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib2",
}},
},
Expand Down Expand Up @@ -1931,13 +1931,13 @@ func testLinuxLibArtirfacts(ctx context.Context, t *testing.T, cfg testLinuxConf
{
Name: "Check that lib files exist under package dir",
Files: map[string]dalec.FileCheckOutput{
filepath.Join(libDir, "test-library-files/lib1"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib1"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib1",
}},
filepath.Join(libDir, "test-library-files/lib2"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib2"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib2",
}},
filepath.Join(libDir, "test-library-files/lib3"): {CheckOutput: dalec.CheckOutput{
filepath.Join(libDir, "lib3"): {CheckOutput: dalec.CheckOutput{
Equals: "this is lib3",
}},
},
Expand Down