Message ID | 20251014205402.1487867-16-ankur.tyagi85@gmail.com |
---|---|
State | New |
Headers | show |
Series | [meta-oe,scarthgap,01/18] dash: set CVE_PRODUCT | expand |
On 10/14/25 22:53, Ankur Tyagi via lists.openembedded.org wrote: > From: Khem Raj <raj.khem@gmail.com> > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > (cherry picked from commit cd6e2d8f53b45108ae9aa7b2a2988452dff4a2eb) > Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> > --- > meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > index 5301071516..9506d0e55d 100644 > --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > @@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" > USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" > > do_install:prepend() { > - rm ${B}/src/${GO_IMPORT}/build.py > - rm ${B}/src/${GO_IMPORT}/build.sh > - rm ${B}/src/${GO_IMPORT}/Dockerfile* > + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py > + test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh > + rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* > + > sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh > } > > do_install:append() { > install -d ${D}${sysconfdir}/influxdb > - install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb > + install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb Careful: ${UNPACKDIR} wasn't a thing in Scarthgap > chown -R root:influxdb ${D}${sysconfdir}/influxdb > > install -d ${D}${sysconfdir}/init.d > - install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb > + install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb > > if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then > install -d ${D}${sysconfdir}/logrotate.d > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#120649): https://lists.openembedded.org/g/openembedded-devel/message/120649 > Mute This Topic: https://lists.openembedded.org/mt/115760530/6084445 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, Oct 15, 2025 at 10:15 AM Gyorgy Sarvari <skandigraun@gmail.com> wrote: > > > On 10/14/25 22:53, Ankur Tyagi via lists.openembedded.org wrote: > > From: Khem Raj <raj.khem@gmail.com> > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > (cherry picked from commit cd6e2d8f53b45108ae9aa7b2a2988452dff4a2eb) > > Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> > > --- > > meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | 11 ++++++----- > > 1 file changed, 6 insertions(+), 5 deletions(-) > > > > diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > > index 5301071516..9506d0e55d 100644 > > --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > > +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb > > @@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" > > USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" > > > > do_install:prepend() { > > - rm ${B}/src/${GO_IMPORT}/build.py > > - rm ${B}/src/${GO_IMPORT}/build.sh > > - rm ${B}/src/${GO_IMPORT}/Dockerfile* > > + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py > > + test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh > > + rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* > > + > > sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh > > } > > > > do_install:append() { > > install -d ${D}${sysconfdir}/influxdb > > - install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb > > + install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb > > Careful: ${UNPACKDIR} wasn't a thing in Scarthgap Ahh right, will fix it in v2 > > > chown -R root:influxdb ${D}${sysconfdir}/influxdb > > > > install -d ${D}${sysconfdir}/init.d > > - install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb > > + install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb > > > > if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then > > install -d ${D}${sysconfdir}/logrotate.d > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#120649): https://lists.openembedded.org/g/openembedded-devel/message/120649 > > Mute This Topic: https://lists.openembedded.org/mt/115760530/6084445 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 5301071516..9506d0e55d 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" do_install:prepend() { - rm ${B}/src/${GO_IMPORT}/build.py - rm ${B}/src/${GO_IMPORT}/build.sh - rm ${B}/src/${GO_IMPORT}/Dockerfile* + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py + test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh + rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* + sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh } do_install:append() { install -d ${D}${sysconfdir}/influxdb - install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb + install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb chown -R root:influxdb ${D}${sysconfdir}/influxdb install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb + install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then install -d ${D}${sysconfdir}/logrotate.d