From 04b999aa9136ba90129e6679d232fd707e71f337 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 11 Oct 2018 11:50:19 +0800 Subject: postgresql: make append version independent Make bbappend version independent and only effective when the openstack distro enabled. Signed-off-by: Mingli Yu Signed-off-by: Bruce Ashfield --- .../recipes-dbs/postgresql/postgresql_%.bbappend | 1 + .../recipes-dbs/postgresql/postgresql_9.%.bbappend | 60 ---------------------- .../postgresql/postgresql_openstack.inc | 60 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 60 deletions(-) create mode 100644 meta-openstack/recipes-dbs/postgresql/postgresql_%.bbappend delete mode 100644 meta-openstack/recipes-dbs/postgresql/postgresql_9.%.bbappend create mode 100644 meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc diff --git a/meta-openstack/recipes-dbs/postgresql/postgresql_%.bbappend b/meta-openstack/recipes-dbs/postgresql/postgresql_%.bbappend new file mode 100644 index 0000000..025ee4e --- /dev/null +++ b/meta-openstack/recipes-dbs/postgresql/postgresql_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-dbs/postgresql/postgresql_9.%.bbappend b/meta-openstack/recipes-dbs/postgresql/postgresql_9.%.bbappend deleted file mode 100644 index 5bf25e1..0000000 --- a/meta-openstack/recipes-dbs/postgresql/postgresql_9.%.bbappend +++ /dev/null @@ -1,60 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://postgresql-init \ - file://postgresql-init.service \ - " - -inherit identity hosts - -SYSTEMD_AUTO_ENABLE_${PN} = "enable" - -# default -DB_DATADIR ?= "/var/lib/postgres/data" - -do_install_append() { - D_DEST_DIR=${D}${sysconfdir}/postgresql - - install -d ${D_DEST_DIR} - install -m 0755 ${WORKDIR}/postgresql-init ${D_DEST_DIR}/postgresql-init - - sed -e "s:%DB_DATADIR%:${DB_DATADIR}:g" -i ${D_DEST_DIR}/postgresql-init - - sed -e "s:%DB_USER%:${DB_USER}:g" -i ${D_DEST_DIR}/postgresql-init - sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${D_DEST_DIR}/postgresql-init - - sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${D_DEST_DIR}/postgresql-init - sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${D_DEST_DIR}/postgresql-init - - sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${D_DEST_DIR}/postgresql-init - sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${D_DEST_DIR}/postgresql-init - - install -d ${D}${systemd_unitdir}/system/ - PG_INIT_SERVICE_FILE=${D}${systemd_unitdir}/system/postgresql-init.service - install -m 644 ${WORKDIR}/postgresql-init.service ${PG_INIT_SERVICE_FILE} - sed -e "s:%SYSCONFIGDIR%:${sysconfdir}:g" -i ${PG_INIT_SERVICE_FILE} - - # Update PGDATA throughout - files="${D}${localstatedir}/lib/${BPN}/.bash_profile" - files="$files ${D}${systemd_unitdir}/system/postgresql.service" - files="$files ${D}${bindir}/${BPN}-setup" - files="$files ${D}${sysconfdir}/init.d/${BPN}-server" - for f in $files - do - sed -e "s:\(PGDATA=\).*$:\1${DB_DATADIR}:g" -i $f - done - - # Ensure DB is initialize before we attempt to start the service - FILE=${D}${systemd_unitdir}/system/postgresql.service - sed -e '/ExecStart=.*/i ExecStartPre=-${sysconfdir}/postgresql/postgresql-init initdb' -i $FILE - sed -e '/ExecStartPre=.*/i PermissionsStartOnly=true' -i $FILE -} - -PACKAGES += " ${PN}-setup" - -SYSTEMD_PACKAGES += "${PN}-setup" -SYSTEMD_SERVICE_${PN}-setup = "postgresql-init.service" - -FILES_${PN}-setup = " \ - ${systemd_unitdir}/system \ -" diff --git a/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc new file mode 100644 index 0000000..5bf25e1 --- /dev/null +++ b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc @@ -0,0 +1,60 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://postgresql-init \ + file://postgresql-init.service \ + " + +inherit identity hosts + +SYSTEMD_AUTO_ENABLE_${PN} = "enable" + +# default +DB_DATADIR ?= "/var/lib/postgres/data" + +do_install_append() { + D_DEST_DIR=${D}${sysconfdir}/postgresql + + install -d ${D_DEST_DIR} + install -m 0755 ${WORKDIR}/postgresql-init ${D_DEST_DIR}/postgresql-init + + sed -e "s:%DB_DATADIR%:${DB_DATADIR}:g" -i ${D_DEST_DIR}/postgresql-init + + sed -e "s:%DB_USER%:${DB_USER}:g" -i ${D_DEST_DIR}/postgresql-init + sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${D_DEST_DIR}/postgresql-init + + sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${D_DEST_DIR}/postgresql-init + sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${D_DEST_DIR}/postgresql-init + + sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${D_DEST_DIR}/postgresql-init + sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${D_DEST_DIR}/postgresql-init + + install -d ${D}${systemd_unitdir}/system/ + PG_INIT_SERVICE_FILE=${D}${systemd_unitdir}/system/postgresql-init.service + install -m 644 ${WORKDIR}/postgresql-init.service ${PG_INIT_SERVICE_FILE} + sed -e "s:%SYSCONFIGDIR%:${sysconfdir}:g" -i ${PG_INIT_SERVICE_FILE} + + # Update PGDATA throughout + files="${D}${localstatedir}/lib/${BPN}/.bash_profile" + files="$files ${D}${systemd_unitdir}/system/postgresql.service" + files="$files ${D}${bindir}/${BPN}-setup" + files="$files ${D}${sysconfdir}/init.d/${BPN}-server" + for f in $files + do + sed -e "s:\(PGDATA=\).*$:\1${DB_DATADIR}:g" -i $f + done + + # Ensure DB is initialize before we attempt to start the service + FILE=${D}${systemd_unitdir}/system/postgresql.service + sed -e '/ExecStart=.*/i ExecStartPre=-${sysconfdir}/postgresql/postgresql-init initdb' -i $FILE + sed -e '/ExecStartPre=.*/i PermissionsStartOnly=true' -i $FILE +} + +PACKAGES += " ${PN}-setup" + +SYSTEMD_PACKAGES += "${PN}-setup" +SYSTEMD_SERVICE_${PN}-setup = "postgresql-init.service" + +FILES_${PN}-setup = " \ + ${systemd_unitdir}/system \ +" -- cgit v1.2.3-54-g00ecf