python3-inotify: Update to 0.2.10 and convert to python3

Message ID 20210513204430.2279717-1-adolf.belka@ipfire.org
State Accepted
Headers
Series python3-inotify: Update to 0.2.10 and convert to python3 |

Commit Message

Adolf Belka May 13, 2021, 8:44 p.m. UTC
  - Update from 0.2.7 to 0.2.10
- Convert from python-inotify to python3-inotify
   make.sh, lfs & rootfiles
- Update rootfiles
- Changelog
  0.2.8: - We now just *skip* the event if not known
    - Implement InotifyTree and InotifyTrees as sub-classes of new BaseTree
      class
    - Made InotifyTree and InotifyTrees sub-classes of new base class
      BaseTree
    - Recursively watch a list of paths/trees
  0.2.9: - Added getter for Inotify object from tree objects
    - Added note to docs about race-conditions. Added small change for
      redundant adds.
    - Slightly reorganized documentation. Updated example.
    - Merge pull request #35 from dsoprea/dustin. Added extensive unit-test
      coverage. Closes all bug requests.
    - Added large amount of unit-test coverage.
       - Now handle rename-specific events.
       - Can now also ignore issues with new directories not existing if
         you're created *and* deleted or renamed a folder since the last
         time events were read.
       - Adjusted requirements for simplicity.
       - Added Python 3 compatibility.
       - Fixed Unicode support.
       - Can now provide `filter_predicate` to event_gen() to allow custom
         loop termination based on events.
       - We'll now terminate the loop when certain events are encountered.
         These events are passed into event_gen() as `terminal_events`. By
         default these are the IN_Q_OVERFLOW and IN_UNMOUNT types.
       - Fixes #28
       - Fixes #23
       - Fixes #22
       - Fixes #19
       - Fixes #16
       - Fixes #15
       - Fixes #5
    - Check presence of both glibc errno and musl libc err
    - Support for musl libc (Alpine Linux)
    - Merge pull request #27 from jessesuen/master. Support for musl libc
      (Alpine Linux)
    - Check presence of both glibc errno and musl libc err
    - Merge pull request #26 from hathcock/hathcock/issue-25. resolves #25,
      list of binary paths can't be logged with existing call
       - Support for musl libc (Alpine Linux)
       - Resolves #25, list of binary paths can't be logged with existing
         call
  0.2.10: - Merge pull request #34 from davidparsson/
            feature/support-moved-directories
      - Support MOVED_FROM and MOVED_TO in BaseTree
    - events: Now log event types from epoll vs data stream.
    - This release implicitly fixed the botched binary package released
      in 0.2.9

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/python-inotify  | 20 --------------------
 config/rootfiles/common/python3-inotify | 17 +++++++++++++++++
 lfs/{python-inotify => python3-inotify} |  6 +++---
 make.sh                                 |  2 +-
 4 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 config/rootfiles/common/python-inotify
 create mode 100644 config/rootfiles/common/python3-inotify
 rename lfs/{python-inotify => python3-inotify} (96%)
  

Comments

Peter Müller May 14, 2021, 7:05 a.m. UTC | #1
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - Update from 0.2.7 to 0.2.10
> - Convert from python-inotify to python3-inotify
>    make.sh, lfs & rootfiles
> - Update rootfiles
> - Changelog
>   0.2.8: - We now just *skip* the event if not known
>     - Implement InotifyTree and InotifyTrees as sub-classes of new BaseTree
>       class
>     - Made InotifyTree and InotifyTrees sub-classes of new base class
>       BaseTree
>     - Recursively watch a list of paths/trees
>   0.2.9: - Added getter for Inotify object from tree objects
>     - Added note to docs about race-conditions. Added small change for
>       redundant adds.
>     - Slightly reorganized documentation. Updated example.
>     - Merge pull request #35 from dsoprea/dustin. Added extensive unit-test
>       coverage. Closes all bug requests.
>     - Added large amount of unit-test coverage.
>        - Now handle rename-specific events.
>        - Can now also ignore issues with new directories not existing if
>          you're created *and* deleted or renamed a folder since the last
>          time events were read.
>        - Adjusted requirements for simplicity.
>        - Added Python 3 compatibility.
>        - Fixed Unicode support.
>        - Can now provide `filter_predicate` to event_gen() to allow custom
>          loop termination based on events.
>        - We'll now terminate the loop when certain events are encountered.
>          These events are passed into event_gen() as `terminal_events`. By
>          default these are the IN_Q_OVERFLOW and IN_UNMOUNT types.
>        - Fixes #28
>        - Fixes #23
>        - Fixes #22
>        - Fixes #19
>        - Fixes #16
>        - Fixes #15
>        - Fixes #5
>     - Check presence of both glibc errno and musl libc err
>     - Support for musl libc (Alpine Linux)
>     - Merge pull request #27 from jessesuen/master. Support for musl libc
>       (Alpine Linux)
>     - Check presence of both glibc errno and musl libc err
>     - Merge pull request #26 from hathcock/hathcock/issue-25. resolves #25,
>       list of binary paths can't be logged with existing call
>        - Support for musl libc (Alpine Linux)
>        - Resolves #25, list of binary paths can't be logged with existing
>          call
>   0.2.10: - Merge pull request #34 from davidparsson/
>             feature/support-moved-directories
>       - Support MOVED_FROM and MOVED_TO in BaseTree
>     - events: Now log event types from epoll vs data stream.
>     - This release implicitly fixed the botched binary package released
>       in 0.2.9
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  config/rootfiles/common/python-inotify  | 20 --------------------
>  config/rootfiles/common/python3-inotify | 17 +++++++++++++++++
>  lfs/{python-inotify => python3-inotify} |  6 +++---
>  make.sh                                 |  2 +-
>  4 files changed, 21 insertions(+), 24 deletions(-)
>  delete mode 100644 config/rootfiles/common/python-inotify
>  create mode 100644 config/rootfiles/common/python3-inotify
>  rename lfs/{python-inotify => python3-inotify} (96%)
> 
> diff --git a/config/rootfiles/common/python-inotify b/config/rootfiles/common/python-inotify
> deleted file mode 100644
> index 5fc062a57..000000000
> --- a/config/rootfiles/common/python-inotify
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#usr/lib/python2.7/site-packages/inotify
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/PKG-INFO
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/SOURCES.txt
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/dependency_links.txt
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/not-zip-safe
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/top_level.txt
> -usr/lib/python2.7/site-packages/inotify/__init__.py
> -usr/lib/python2.7/site-packages/inotify/__init__.pyc
> -usr/lib/python2.7/site-packages/inotify/adapters.py
> -usr/lib/python2.7/site-packages/inotify/adapters.pyc
> -usr/lib/python2.7/site-packages/inotify/calls.py
> -usr/lib/python2.7/site-packages/inotify/calls.pyc
> -usr/lib/python2.7/site-packages/inotify/constants.py
> -usr/lib/python2.7/site-packages/inotify/constants.pyc
> -usr/lib/python2.7/site-packages/inotify/library.py
> -usr/lib/python2.7/site-packages/inotify/library.pyc
> -#usr/lib/python2.7/site-packages/inotify/resources
> -#usr/lib/python2.7/site-packages/inotify/resources/README.rst
> -#usr/lib/python2.7/site-packages/inotify/resources/requirements.txt
> diff --git a/config/rootfiles/common/python3-inotify b/config/rootfiles/common/python3-inotify
> new file mode 100644
> index 000000000..b1fae54aa
> --- /dev/null
> +++ b/config/rootfiles/common/python3-inotify
> @@ -0,0 +1,17 @@
> +#usr/lib/python3.8/site-packages/inotify
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/PKG-INFO
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/SOURCES.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/dependency_links.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/not-zip-safe
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/requires.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/top_level.txt
> +usr/lib/python3.8/site-packages/inotify/__init__.py
> +usr/lib/python3.8/site-packages/inotify/adapters.py
> +usr/lib/python3.8/site-packages/inotify/calls.py
> +usr/lib/python3.8/site-packages/inotify/constants.py
> +usr/lib/python3.8/site-packages/inotify/library.py
> +#usr/lib/python3.8/site-packages/inotify/resources
> +#usr/lib/python3.8/site-packages/inotify/resources/README.rst
> +#usr/lib/python3.8/site-packages/inotify/resources/requirements.txt
> +usr/lib/python3.8/site-packages/inotify/test_support.py
> diff --git a/lfs/python-inotify b/lfs/python3-inotify
> similarity index 96%
> rename from lfs/python-inotify
> rename to lfs/python3-inotify
> index 93775c595..a1f9e45ef 100644
> --- a/lfs/python-inotify
> +++ b/lfs/python3-inotify
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 0.2.7
> +VER        = 0.2.10
>  
>  THISAPP    = inotify-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = ced4c0469f9fd64170d9d907e4aec208
> +$(DL_FILE)_MD5 = 33c7ee4a7cde60036a2d2a1a55c7c7c8
>  
>  install : $(TARGET)
>  
> @@ -70,6 +70,6 @@ $(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) && python setup.py install --root=/
> +	cd $(DIR_APP) && python3 setup.py install --root=/
>  	@rm -rf $(DIR_APP)
>  	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 25616cc4e..162e2e312 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1349,7 +1349,7 @@ buildipfire() {
>    lfsmake2 python-mechanize
>    lfsmake2 python-feedparser
>    lfsmake2 python-rssdler
> -  lfsmake2 python-inotify
> +  lfsmake2 python3-inotify
>    lfsmake2 python-docutils
>    lfsmake2 python-daemon
>    lfsmake2 python-ipaddress
>
  
Michael Tremer May 14, 2021, 11:29 a.m. UTC | #2
Hello,

This module is being used for the dhcp-unbound-bridge and can only be merged together with that script being migrated to Python 3.

Apart from that, nice work. Looks like a very straight-forward one.

Best,
-Michael

> On 13 May 2021, at 21:44, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - Update from 0.2.7 to 0.2.10
> - Convert from python-inotify to python3-inotify
>   make.sh, lfs & rootfiles
> - Update rootfiles
> - Changelog
>  0.2.8: - We now just *skip* the event if not known
>    - Implement InotifyTree and InotifyTrees as sub-classes of new BaseTree
>      class
>    - Made InotifyTree and InotifyTrees sub-classes of new base class
>      BaseTree
>    - Recursively watch a list of paths/trees
>  0.2.9: - Added getter for Inotify object from tree objects
>    - Added note to docs about race-conditions. Added small change for
>      redundant adds.
>    - Slightly reorganized documentation. Updated example.
>    - Merge pull request #35 from dsoprea/dustin. Added extensive unit-test
>      coverage. Closes all bug requests.
>    - Added large amount of unit-test coverage.
>       - Now handle rename-specific events.
>       - Can now also ignore issues with new directories not existing if
>         you're created *and* deleted or renamed a folder since the last
>         time events were read.
>       - Adjusted requirements for simplicity.
>       - Added Python 3 compatibility.
>       - Fixed Unicode support.
>       - Can now provide `filter_predicate` to event_gen() to allow custom
>         loop termination based on events.
>       - We'll now terminate the loop when certain events are encountered.
>         These events are passed into event_gen() as `terminal_events`. By
>         default these are the IN_Q_OVERFLOW and IN_UNMOUNT types.
>       - Fixes #28
>       - Fixes #23
>       - Fixes #22
>       - Fixes #19
>       - Fixes #16
>       - Fixes #15
>       - Fixes #5
>    - Check presence of both glibc errno and musl libc err
>    - Support for musl libc (Alpine Linux)
>    - Merge pull request #27 from jessesuen/master. Support for musl libc
>      (Alpine Linux)
>    - Check presence of both glibc errno and musl libc err
>    - Merge pull request #26 from hathcock/hathcock/issue-25. resolves #25,
>      list of binary paths can't be logged with existing call
>       - Support for musl libc (Alpine Linux)
>       - Resolves #25, list of binary paths can't be logged with existing
>         call
>  0.2.10: - Merge pull request #34 from davidparsson/
>            feature/support-moved-directories
>      - Support MOVED_FROM and MOVED_TO in BaseTree
>    - events: Now log event types from epoll vs data stream.
>    - This release implicitly fixed the botched binary package released
>      in 0.2.9
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/python-inotify  | 20 --------------------
> config/rootfiles/common/python3-inotify | 17 +++++++++++++++++
> lfs/{python-inotify => python3-inotify} |  6 +++---
> make.sh                                 |  2 +-
> 4 files changed, 21 insertions(+), 24 deletions(-)
> delete mode 100644 config/rootfiles/common/python-inotify
> create mode 100644 config/rootfiles/common/python3-inotify
> rename lfs/{python-inotify => python3-inotify} (96%)
> 
> diff --git a/config/rootfiles/common/python-inotify b/config/rootfiles/common/python-inotify
> deleted file mode 100644
> index 5fc062a57..000000000
> --- a/config/rootfiles/common/python-inotify
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#usr/lib/python2.7/site-packages/inotify
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/PKG-INFO
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/SOURCES.txt
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/dependency_links.txt
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/not-zip-safe
> -#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/top_level.txt
> -usr/lib/python2.7/site-packages/inotify/__init__.py
> -usr/lib/python2.7/site-packages/inotify/__init__.pyc
> -usr/lib/python2.7/site-packages/inotify/adapters.py
> -usr/lib/python2.7/site-packages/inotify/adapters.pyc
> -usr/lib/python2.7/site-packages/inotify/calls.py
> -usr/lib/python2.7/site-packages/inotify/calls.pyc
> -usr/lib/python2.7/site-packages/inotify/constants.py
> -usr/lib/python2.7/site-packages/inotify/constants.pyc
> -usr/lib/python2.7/site-packages/inotify/library.py
> -usr/lib/python2.7/site-packages/inotify/library.pyc
> -#usr/lib/python2.7/site-packages/inotify/resources
> -#usr/lib/python2.7/site-packages/inotify/resources/README.rst
> -#usr/lib/python2.7/site-packages/inotify/resources/requirements.txt
> diff --git a/config/rootfiles/common/python3-inotify b/config/rootfiles/common/python3-inotify
> new file mode 100644
> index 000000000..b1fae54aa
> --- /dev/null
> +++ b/config/rootfiles/common/python3-inotify
> @@ -0,0 +1,17 @@
> +#usr/lib/python3.8/site-packages/inotify
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/PKG-INFO
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/SOURCES.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/dependency_links.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/not-zip-safe
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/requires.txt
> +#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/top_level.txt
> +usr/lib/python3.8/site-packages/inotify/__init__.py
> +usr/lib/python3.8/site-packages/inotify/adapters.py
> +usr/lib/python3.8/site-packages/inotify/calls.py
> +usr/lib/python3.8/site-packages/inotify/constants.py
> +usr/lib/python3.8/site-packages/inotify/library.py
> +#usr/lib/python3.8/site-packages/inotify/resources
> +#usr/lib/python3.8/site-packages/inotify/resources/README.rst
> +#usr/lib/python3.8/site-packages/inotify/resources/requirements.txt
> +usr/lib/python3.8/site-packages/inotify/test_support.py
> diff --git a/lfs/python-inotify b/lfs/python3-inotify
> similarity index 96%
> rename from lfs/python-inotify
> rename to lfs/python3-inotify
> index 93775c595..a1f9e45ef 100644
> --- a/lfs/python-inotify
> +++ b/lfs/python3-inotify
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 0.2.7
> +VER        = 0.2.10
> 
> THISAPP    = inotify-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = ced4c0469f9fd64170d9d907e4aec208
> +$(DL_FILE)_MD5 = 33c7ee4a7cde60036a2d2a1a55c7c7c8
> 
> install : $(TARGET)
> 
> @@ -70,6 +70,6 @@ $(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) && python setup.py install --root=/
> +	cd $(DIR_APP) && python3 setup.py install --root=/
> 	@rm -rf $(DIR_APP)
> 	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 25616cc4e..162e2e312 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1349,7 +1349,7 @@ buildipfire() {
>   lfsmake2 python-mechanize
>   lfsmake2 python-feedparser
>   lfsmake2 python-rssdler
> -  lfsmake2 python-inotify
> +  lfsmake2 python3-inotify
>   lfsmake2 python-docutils
>   lfsmake2 python-daemon
>   lfsmake2 python-ipaddress
> -- 
> 2.31.1
>
  

Patch

diff --git a/config/rootfiles/common/python-inotify b/config/rootfiles/common/python-inotify
deleted file mode 100644
index 5fc062a57..000000000
--- a/config/rootfiles/common/python-inotify
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#usr/lib/python2.7/site-packages/inotify
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/PKG-INFO
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/SOURCES.txt
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/dependency_links.txt
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/not-zip-safe
-#usr/lib/python2.7/site-packages/inotify-0.2.7-py2.7.egg-info/top_level.txt
-usr/lib/python2.7/site-packages/inotify/__init__.py
-usr/lib/python2.7/site-packages/inotify/__init__.pyc
-usr/lib/python2.7/site-packages/inotify/adapters.py
-usr/lib/python2.7/site-packages/inotify/adapters.pyc
-usr/lib/python2.7/site-packages/inotify/calls.py
-usr/lib/python2.7/site-packages/inotify/calls.pyc
-usr/lib/python2.7/site-packages/inotify/constants.py
-usr/lib/python2.7/site-packages/inotify/constants.pyc
-usr/lib/python2.7/site-packages/inotify/library.py
-usr/lib/python2.7/site-packages/inotify/library.pyc
-#usr/lib/python2.7/site-packages/inotify/resources
-#usr/lib/python2.7/site-packages/inotify/resources/README.rst
-#usr/lib/python2.7/site-packages/inotify/resources/requirements.txt
diff --git a/config/rootfiles/common/python3-inotify b/config/rootfiles/common/python3-inotify
new file mode 100644
index 000000000..b1fae54aa
--- /dev/null
+++ b/config/rootfiles/common/python3-inotify
@@ -0,0 +1,17 @@ 
+#usr/lib/python3.8/site-packages/inotify
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/not-zip-safe
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/inotify-0.2.10-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/inotify/__init__.py
+usr/lib/python3.8/site-packages/inotify/adapters.py
+usr/lib/python3.8/site-packages/inotify/calls.py
+usr/lib/python3.8/site-packages/inotify/constants.py
+usr/lib/python3.8/site-packages/inotify/library.py
+#usr/lib/python3.8/site-packages/inotify/resources
+#usr/lib/python3.8/site-packages/inotify/resources/README.rst
+#usr/lib/python3.8/site-packages/inotify/resources/requirements.txt
+usr/lib/python3.8/site-packages/inotify/test_support.py
diff --git a/lfs/python-inotify b/lfs/python3-inotify
similarity index 96%
rename from lfs/python-inotify
rename to lfs/python3-inotify
index 93775c595..a1f9e45ef 100644
--- a/lfs/python-inotify
+++ b/lfs/python3-inotify
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 0.2.7
+VER        = 0.2.10
 
 THISAPP    = inotify-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ced4c0469f9fd64170d9d907e4aec208
+$(DL_FILE)_MD5 = 33c7ee4a7cde60036a2d2a1a55c7c7c8
 
 install : $(TARGET)
 
@@ -70,6 +70,6 @@  $(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) && python setup.py install --root=/
+	cd $(DIR_APP) && python3 setup.py install --root=/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 25616cc4e..162e2e312 100755
--- a/make.sh
+++ b/make.sh
@@ -1349,7 +1349,7 @@  buildipfire() {
   lfsmake2 python-mechanize
   lfsmake2 python-feedparser
   lfsmake2 python-rssdler
-  lfsmake2 python-inotify
+  lfsmake2 python3-inotify
   lfsmake2 python-docutils
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress