From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Add tool to format rootfiles
Date: Sat, 05 Sep 2020 21:30:26 +0200
Message-ID: <b22e42a7-e263-324f-68b2-1bdd1a3dedb2@gmail.com>
In-Reply-To: <da0ec7fe-8c64-b00e-ae8b-19cb4a2bb76f@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0008984133506511030=="
List-Id: <development.lists.ipfire.org>

--===============0008984133506511030==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hallo Jonatan,

Having looked at /usr/lib further I have noted that programmes such as conntr=
ack-tools and collectd just use .so files and the solution with them is to ha=
ve their own directory under /usr/lib.

So I could do the same with bacula and change the libdir in configure to be /=
usr/lib/bacula. I think that should solve the problem. Just have to remember =
to do the change when the next bacula update occurs.

Regards,

Adolf

On 05/09/2020 21:14, Adolf Belka wrote:
> Hallo Jonatan,
>
> I see that you have a rule to remove all .so shared libraries from /usr/lib
>
> With the bacula addon, this will give a problem as bacula have a different =
approach to the naming of their shared libraries
>
> /usr/lib/libbac-9.6.5.so
> /usr/lib/libbaccfg-9.6.5.so
> /usr/lib/libbaccfg.so -> libbaccfg-9.6.5.so
> /usr/lib/libbacfind-9.6.5.so
> /usr/lib/libbacfind.so -> libbacfind-9.6.5.so
> /usr/lib/libbac.so -> libbac-9.6.5.so
>
> As you can see the .so is at the end of all the files so that rule would re=
move all shared libraries causing bacula to fail to load.
>
> If this rule is implemented in make.sh then the only option I can think of =
for bacula would be to change the library location from /usr/lib to /lib unle=
ss someone else has any suggestions for how I could deal with it.
>
>
> Regards,
>
> Adolf
>
> On 05/09/2020 10:40, Jonatan Schlag wrote:
>> There are some rules which files should be definitely not included in a
>> rootfile. Applying these rules by hand is error prone and annoying. So I
>> wrote these simple command, because computer can apply these rules
>> faster and better than humans :-;
>>
>> It removes all lines starting with '-' and comment out all lines which
>> point to files which should not be included in the distribution. This
>> list needs to be extended, but I think this is a good starting point to
>> make the creating of rootfiles easier.
>>
>> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
>> ---
>> =C2=A0 make.sh | 37 ++++++++++++++++++++++++++++++++++++-
>> =C2=A0 1 file changed, 36 insertions(+), 1 deletion(-)
>>
>> diff --git a/make.sh b/make.sh
>> index 4a9dd3cb6..909d4a4de 100755
>> --- a/make.sh
>> +++ b/make.sh
>> @@ -1895,6 +1895,41 @@ downloadsrc)
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cd - >/dev/null 2>&1
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;;
>> +format-rootfile)
>> +=C2=A0=C2=A0=C2=A0 if [ ! -f $2 ]; then
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo -n "'$2' is not a regular=
 file"
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 beautify message FAIL
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exit 1
>> +=C2=A0=C2=A0=C2=A0 fi
>> +
>> +=C2=A0=C2=A0=C2=A0 ROOTFILE_TO_FORMAT=3D"$2"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .so files in /usr/lib
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/lib\/.*\.so$/s/+/#/g' "$ROOTFILE_TO_F=
ORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .a files in /usr/lib
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/lib\/.*\.a$/s/+/#/g' "$ROOTFILE_TO_FO=
RMAT"
>> +
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .la files in /usr/lib
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/lib\/.*\.la$/s/+/#/g' "$ROOTFILE_TO_F=
ORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .hpp files in /usr/include
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/include\/.*\.hpp$/s/+/#/g' "$ROOTFILE=
_TO_FORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .h files in /usr/include
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/include\/.*\.h$/s/+/#/g' "$ROOTFILE_T=
O_FORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .ipp files in /usr/include
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/include\/.*\.ipp$/s/+/#/g' "$ROOTFILE=
_TO_FORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all .m4 files in /usr/share/aclocal
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^\+usr\/share\/aclocal\/.*\.h$/s/+/#/g' "$ROO=
TFILE_TO_FORMAT"
>> +
>> +=C2=A0=C2=A0=C2=A0 # Remove all lines starting with -
>> +=C2=A0=C2=A0=C2=A0 sed -i '/^-.*$/d' "$ROOTFILE_TO_FORMAT"
>> +
>> +;;
>> =C2=A0 toolchain)
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # Clear screen
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ${INTERACTIVE} && clear
>> @@ -1990,7 +2025,7 @@ find-dependencies)
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exec "${BASEDIR}/tools/find-dependencies" "=
${BASEDIR}/build" "$@"
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;;
>> =C2=A0 *)
>> -=C2=A0=C2=A0=C2=A0 echo "Usage: $0 {build|changelog|clean|gettoolchain|do=
wnloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
>> +=C2=A0=C2=A0=C2=A0 echo "Usage: $0 {build|changelog|clean|format-rootfile=
|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-depen=
dencies}"
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cat doc/make.sh-usage
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;;
>> =C2=A0 esac

--===============0008984133506511030==--