[PATCH 1/2] Fix rootfile of keepalived after initscript changes

[PATCH 1/2] Fix rootfile of keepalived after initscript changes

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 630 bytes --]

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/packages/keepalived | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived
index 88cfeed..fbf5702 100644
--- a/config/rootfiles/packages/keepalived
+++ b/config/rootfiles/packages/keepalived
@@ -27,6 +27,7 @@ etc/keepalived/samples
 #etc/keepalived/samples/root.pem
 #etc/keepalived/samples/sample.misccheck.smbcheck.sh
 #etc/sysconfig/keepalived
+etc/rc.d/init.d/keepalived
 usr/bin/genhash
 usr/sbin/keepalived
 #usr/share/man/man1/genhash.1
-- 
2.1.4

[PATCH 1/2] Prepare for python3

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

The build of ipaadr fails with python3 because two possibilities of
/usr/lib/python* are availible. This patch set the path to
/usr/lib/python2* to make the path clear.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 lfs/ipaddr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lfs/ipaddr b/lfs/ipaddr
index 4b74e02..186141c 100644
--- a/lfs/ipaddr
+++ b/lfs/ipaddr
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python*
+	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python2*
 	/usr/bin/python -c "import ipaddr"
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.1.4

Re: [PATCH 1/2] Prepare for python3

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

Sorry this path is already in next, he can safely ignored.

Am Fr, 10. Mär, 2017 um 3:30 schrieb Jonatan Schlag 
<jonatan.schlag(a)ipfire.org>:
> The build of ipaadr fails with python3 because two possibilities of
> /usr/lib/python* are availible. This patch set the path to
> /usr/lib/python2* to make the path clear.
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
>  lfs/ipaddr | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lfs/ipaddr b/lfs/ipaddr
> index 4b74e02..186141c 100644
> --- a/lfs/ipaddr
> +++ b/lfs/ipaddr
> @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python*
> +	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python2*
>  	/usr/bin/python -c "import ipaddr"
>  	@rm -rf $(DIR_APP)
>  	@$(POSTBUILD)
> --
> 2.1.4
> 

Re: [PATCH 1/2] Prepare for python3

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

Okay, ignored this. Merged the other two.

-Michael

On Fri, 2017-03-10 at 15:32 +0100, Jonatan Schlag wrote:
> Sorry this path is already in next, he can safely ignored.
> 
> Am Fr, 10. Mär, 2017 um 3:30 schrieb Jonatan Schlag 
> <jonatan.schlag(a)ipfire.org>:
> > 
> > The build of ipaadr fails with python3 because two possibilities of
> > /usr/lib/python* are availible. This patch set the path to
> > /usr/lib/python2* to make the path clear.
> > 
> > Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> > ---
> >  lfs/ipaddr | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/lfs/ipaddr b/lfs/ipaddr
> > index 4b74e02..186141c 100644
> > --- a/lfs/ipaddr
> > +++ b/lfs/ipaddr
> > @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
> >  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> >  	@$(PREBUILD)
> >  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> > -	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python*
> > +	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python2*
> >  	/usr/bin/python -c "import ipaddr"
> >  	@rm -rf $(DIR_APP)
> >  	@$(POSTBUILD)
> > --
> > 2.1.4
> > 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Python3

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

Hi,
the following patches include python3 in ipfire. 

Unfortunately, the flash image build no more. The build fails with a 
tar 
error complaining about to less disk space. I did not found out what the 
problem is, so somebody else has to investigate time into this problem 
to find a solution.

Regards Jonatan

[PATCH 1/2] Prepare for python3

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 795 bytes --]

The build of ipaadr fails with python3 because two possibilities of
/usr/lib/python* are availible. This patch set the path to
/usr/lib/python2* to make the path clear.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 lfs/ipaddr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lfs/ipaddr b/lfs/ipaddr
index 4b74e02..186141c 100644
--- a/lfs/ipaddr
+++ b/lfs/ipaddr
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python*
+	cd $(DIR_APP) && install -m 0644 ipaddr.py /usr/lib/python2*
 	/usr/bin/python -c "import ipaddr"
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.1.4