mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

freeradius: mutlilib fixes

Browse Source 
Define raddbdir based on multilib
Add multilib headers and scripts for conflicting content

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Jeremy Puhlman
2022-07-01 11:52:44 -07:00
committed by Khem Raj
parent e80ce510e1
commit 8687d488f7
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
+21 -13
View File
@@ -34,6 +34,8 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0
file://check-openssl-cmds-in-script-bootstrap.patch \ file://check-openssl-cmds-in-script-bootstrap.patch \
" "
raddbdir="${sysconfdir}/${MLPREFIX}raddb"
SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a" SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
@@ -48,6 +50,7 @@ EXTRA_OECONF = " --enable-strict-dependencies \
--with-docdir=${docdir}/freeradius-${PV} \ --with-docdir=${docdir}/freeradius-${PV} \
--with-openssl-includes=${STAGING_INCDIR} \ --with-openssl-includes=${STAGING_INCDIR} \
--with-openssl-libraries=${STAGING_LIBDIR} \ --with-openssl-libraries=${STAGING_LIBDIR} \
--with-raddbdir=${raddbdir} \
--without-rlm_ippool \ --without-rlm_ippool \
--without-rlm_cache_memcached \ --without-rlm_cache_memcached \
--without-rlm_counter \ --without-rlm_counter \
@@ -98,7 +101,9 @@ PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl"
PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast"
PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd"
inherit useradd autotools-brokensep update-rc.d systemd inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header
MULTILIB_SCRIPTS = "${PN}:${sbindir}/checkrad"
# This is not a cpan or python based package, but it needs some definitions # This is not a cpan or python based package, but it needs some definitions
# from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python # from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python
@@ -141,7 +146,7 @@ do_install() {
oe_runmake install R=${D} INSTALLSTRIP="" oe_runmake install R=${D} INSTALLSTRIP=""
# remove unsupported config files # remove unsupported config files
rm -f ${D}/${sysconfdir}/raddb/experimental.conf rm -f ${D}/${raddbdir}/experimental.conf
# remove scripts that required Perl(DBI) # remove scripts that required Perl(DBI)
rm -rf ${D}/${bindir}/radsqlrelay rm -rf ${D}/${bindir}/radsqlrelay
@@ -153,7 +158,7 @@ do_install() {
rm -rf ${D}/${localstatedir}/log/ rm -rf ${D}/${localstatedir}/log/
install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd
chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ chown -R radiusd:radiusd ${D}/${raddbdir}
chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd
# For systemd # For systemd
@@ -169,6 +174,9 @@ do_install() {
install -d ${D}${sysconfdir}/tmpfiles.d/ install -d ${D}${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf
fi fi
oe_multilib_header freeradius/autoconf.h
oe_multilib_header freeradius/missing.h
oe_multilib_header freeradius/radpaths.h
} }
# This is only needed when we install/update on a running target. # This is only needed when we install/update on a running target.
@@ -183,7 +191,7 @@ pkg_postinst:${PN} () {
fi fi
# Fix ownership for /etc/raddb/*, /var/lib/radiusd # Fix ownership for /etc/raddb/*, /var/lib/radiusd
chown -R radiusd:radiusd ${sysconfdir}/raddb chown -R radiusd:radiusd ${raddbdir}
chown -R radiusd:radiusd ${localstatedir}/lib/radiusd chown -R radiusd:radiusd ${localstatedir}/lib/radiusd
fi fi
} }
@@ -204,30 +212,30 @@ PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \
FILES:${PN}-utils = "${bindir}/*" FILES:${PN}-utils = "${bindir}/*"
FILES:${PN}-ldap = "${libdir}/rlm_ldap.so* \ FILES:${PN}-ldap = "${libdir}/rlm_ldap.so* \
${sysconfdir}/raddb/mods-available/ldap \ ${raddbdir}/mods-available/ldap \
" "
FILES:${PN}-krb5 = "${libdir}/rlm_krb5.so* \ FILES:${PN}-krb5 = "${libdir}/rlm_krb5.so* \
${sysconfdir}/raddb/mods-available/krb5 \ ${raddbdir}/mods-available/krb5 \
" "
FILES:${PN}-perl = "${libdir}/rlm_perl.so* \ FILES:${PN}-perl = "${libdir}/rlm_perl.so* \
${sysconfdir}/raddb/mods-config/perl \ ${raddbdir}/mods-config/perl \
${sysconfdir}/raddb/mods-available/perl \ ${raddbdir}/mods-available/perl \
" "
FILES:${PN}-python = "${libdir}/rlm_python3.so* \ FILES:${PN}-python = "${libdir}/rlm_python3.so* \
${sysconfdir}/raddb/mods-config/python3 \ ${raddbdir}/mods-config/python3 \
${sysconfdir}/raddb/mods-available/python3 \ ${raddbdir}/mods-available/python3 \
" "
FILES:${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ FILES:${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \
${sysconfdir}/raddb/mods-config/sql/*/mysql \ ${raddbdir}/mods-config/sql/*/mysql \
${sysconfdir}/raddb/mods-available/sql \ ${raddbdir}/mods-available/sql \
" "
FILES:${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ FILES:${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \
${sysconfdir}/raddb/mods-config/sql/*/postgresql \ ${raddbdir}/mods-config/sql/*/postgresql \
" "
FILES:${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" FILES:${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*"