summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup_native/Package_scripts_generated.mk1
-rw-r--r--solenv/bin/modules/installer/epmfile.pm2
2 files changed, 1 insertions, 2 deletions
diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk
index 898b4cb108d2..958eff2e75b8 100644
--- a/setup_native/Package_scripts_generated.mk
+++ b/setup_native/Package_scripts_generated.mk
@@ -20,7 +20,6 @@ ifeq ($(OS),LINUX)
ifneq ($(filter rpm,$(PKGFORMAT)),)
$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
-$(eval $(call gb_Package_add_file,scripts_generated,bin/openoffice-userland-1.0-0.noarch.rpm,noarch/fake-db-1.0-0.noarch.rpm))
endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 58fe27d4bab0..72420d4320bf 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -784,7 +784,7 @@ sub get_ld_preload_string
{
my ($includepatharrayref) = @_;
- my $getuidlibraryname = "getuid.so";
+ my $getuidlibraryname = "libgetuid.so";
my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_ld_preload_string"); }