igmpproxy: fix build fail and move binary to /usr/sbin
| Message ID | 1464759232-30382-1-git-send-email-marcel.lorenz@ipfire.org |
|---|---|
| State | Superseded |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (hedwig.ipfire.org [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id BED6761529 for <patchwork@ipfire.org>; Wed, 1 Jun 2016 07:21:23 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 174B114AF; Wed, 1 Jun 2016 07:21:23 +0200 (CEST) Received: from mint01.skynet.local (ip5f5b7cdb.dynamic.kabel-deutschland.de [95.91.124.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4E59C118C for <development@lists.ipfire.org>; Wed, 1 Jun 2016 07:21:21 +0200 (CEST) From: Marcel Lorenz <marcel.lorenz@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] igmpproxy: fix build fail and move binary to /usr/sbin Date: Wed, 1 Jun 2016 07:33:52 +0200 Message-Id: <1464759232-30382-1-git-send-email-marcel.lorenz@ipfire.org> X-Mailer: git-send-email 1.9.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Marcel Lorenz
June 1, 2016, 3:33 p.m. UTC
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
config/rootfiles/packages/igmpproxy | 2 +-
lfs/igmpproxy | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Comments
Hi, does the configure script not support --prefix=/usr here? This would make moving the binary unnecessary and is a cleaner approach. Best, -Michael On Wed, 2016-06-01 at 07:33 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > --- > config/rootfiles/packages/igmpproxy | 2 +- > lfs/igmpproxy | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/config/rootfiles/packages/igmpproxy > b/config/rootfiles/packages/igmpproxy > index 1b34521..dda6dce 100644 > --- a/config/rootfiles/packages/igmpproxy > +++ b/config/rootfiles/packages/igmpproxy > @@ -1,5 +1,5 @@ > etc/igmpproxy.conf > -usr/local/sbin/igmpproxy > #usr/local/share/man/man5/igmpproxy.conf.5 > #usr/local/share/man/man8/igmpproxy.8 > +usr/sbin/igmpproxy > var/ipfire/backup/addons/includes/igmpproxy > diff --git a/lfs/igmpproxy b/lfs/igmpproxy > index fb1426f..256022c 100644 > --- a/lfs/igmpproxy > +++ b/lfs/igmpproxy > @@ -82,11 +82,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-003- > Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch > cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-004- > Restrict-igmp-reports-forwarding-to-upstream-interfa.patch > cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-100- > use-monotic-clock-instead-of-time-of-day.patch > - cd $(DIR_APP) && autoreconf > + cd $(DIR_APP) && aclocal && automake --add-missing && autoreconf > cd $(DIR_APP) && ./configure --sysconfdir=/etc > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \ > /var/ipfire/backup/addons/includes/igmpproxy > + mv -vf /usr/local/sbin/igmpproxy /usr/sbin/ > @rm -rf $(DIR_APP) > @$(POSTBUILD)
Oh, ok i make new... it's working with --prefix=/usr Best, Marcel Am 2016-06-01 22:55, schrieb Michael Tremer: > Hi, > > does the configure script not support --prefix=/usr here? > > This would make moving the binary unnecessary and is a cleaner > approach. > > Best, > -Michael > > On Wed, 2016-06-01 at 07:33 +0200, Marcel Lorenz wrote: >> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> >> --- >> config/rootfiles/packages/igmpproxy | 2 +- >> lfs/igmpproxy | 3 ++- >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/config/rootfiles/packages/igmpproxy >> b/config/rootfiles/packages/igmpproxy >> index 1b34521..dda6dce 100644 >> --- a/config/rootfiles/packages/igmpproxy >> +++ b/config/rootfiles/packages/igmpproxy >> @@ -1,5 +1,5 @@ >> etc/igmpproxy.conf >> -usr/local/sbin/igmpproxy >> #usr/local/share/man/man5/igmpproxy.conf.5 >> #usr/local/share/man/man8/igmpproxy.8 >> +usr/sbin/igmpproxy >> var/ipfire/backup/addons/includes/igmpproxy >> diff --git a/lfs/igmpproxy b/lfs/igmpproxy >> index fb1426f..256022c 100644 >> --- a/lfs/igmpproxy >> +++ b/lfs/igmpproxy >> @@ -82,11 +82,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-003- >> Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch >> cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-004- >> Restrict-igmp-reports-forwarding-to-upstream-interfa.patch >> cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-100- >> use-monotic-clock-instead-of-time-of-day.patch >> - cd $(DIR_APP) && autoreconf >> + cd $(DIR_APP) && aclocal && automake --add-missing && autoreconf >> cd $(DIR_APP) && ./configure --sysconfdir=/etc >> cd $(DIR_APP) && make $(MAKETUNING) >> cd $(DIR_APP) && make install >> install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \ >> /var/ipfire/backup/addons/includes/igmpproxy >> + mv -vf /usr/local/sbin/igmpproxy /usr/sbin/ >> @rm -rf $(DIR_APP) >> @$(POSTBUILD)