Signed-off-by: Jonatan Schlag jonatan.schlag@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
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@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)
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@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@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
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@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@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
-
Jonatan Schlag -
Michael Tremer