From 60295ba1f7c2326d376f19415366b86afb98b118 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 20 Jun 2015 11:52:13 +0200 Subject: [PATCH] Move ports and protocols files back to data directory in Haiku package. These files are required for netresolv functionality, and there is no real use in modifying them as settings files. Restore the previous behavior, the files are stored in data and part of the Haiku package. This means there is no need for a fresh install from image to get the files anymore. Fixes #12156. --- build/jam/images/definitions/minimum | 6 +----- build/jam/packages/Haiku | 5 +++++ build/jam/packages/HaikuBootstrap | 5 +++++ data/{settings => system/data}/network/ports | 0 data/{settings => system/data}/network/protocols | 0 src/kits/network/netresolv/irs/getprotoent_r.c | 2 +- src/kits/network/netresolv/irs/getservent_r.c | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) rename data/{settings => system/data}/network/ports (100%) rename data/{settings => system/data}/network/protocols (100%) diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 20368ed2f7..4cc2788cea 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -271,11 +271,7 @@ SEARCH on $(driverSettingsFiles) AddFilesToHaikuImage home config settings kernel drivers : $(driverSettingsFiles) ; -local networkSettingsFiles = - ports - protocols - services -; +local networkSettingsFiles = services ; SEARCH on $(networkSettingsFiles) = [ FDirName $(HAIKU_TOP) data settings network ] ; AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ; diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index a672605684..9043132325 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -298,6 +298,11 @@ CopyDirectoryToPackage data : [ FDirName $(HAIKU_TOP) data system data licenses ] : licenses ; +# netresolv support files +CopyDirectoryToPackage data + : [ FDirName $(HAIKU_TOP) data system data network ] + : network ; + # Copy documentation as per DiskUsage's license requirement. CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs apps diskusage ] diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 3ef6cdf377..f6aee2aa0e 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -253,6 +253,11 @@ CopyDirectoryToPackage data : [ FDirName $(HAIKU_TOP) data system data licenses ] : licenses ; +# netresolv support files +CopyDirectoryToPackage data + : [ FDirName $(HAIKU_TOP) data system data network ] + : network ; + # Copy documentation as per DiskUsage's license requirement. CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs apps diskusage ] diff --git a/data/settings/network/ports b/data/system/data/network/ports similarity index 100% rename from data/settings/network/ports rename to data/system/data/network/ports diff --git a/data/settings/network/protocols b/data/system/data/network/protocols similarity index 100% rename from data/settings/network/protocols rename to data/system/data/network/protocols diff --git a/src/kits/network/netresolv/irs/getprotoent_r.c b/src/kits/network/netresolv/irs/getprotoent_r.c index 0ed0bc2bca..d1a9c0dfb1 100644 --- a/src/kits/network/netresolv/irs/getprotoent_r.c +++ b/src/kits/network/netresolv/irs/getprotoent_r.c @@ -60,7 +60,7 @@ setprotoent_r(int f, struct protoent_data *pd) { if (pd->fp == NULL) { char buffer[256]; - find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)); + find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer)); strlcat(buffer, "/network/protocols", sizeof(buffer)); pd->fp = fopen(buffer, "re"); diff --git a/src/kits/network/netresolv/irs/getservent_r.c b/src/kits/network/netresolv/irs/getservent_r.c index 0ee4b2e8f7..6f39d7934b 100644 --- a/src/kits/network/netresolv/irs/getservent_r.c +++ b/src/kits/network/netresolv/irs/getservent_r.c @@ -84,7 +84,7 @@ _servent_open(struct servent_data *sd) } #endif - find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)); + find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer)); strlcat(buffer, "/network/ports", sizeof(buffer)); sd->plainfile = fopen(buffer, "re");