| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- diff -Naurp a/.applied_patches_list b/.applied_patches_list
- --- a/.applied_patches_list 2017-12-11 12:39:29.935135715 +0100
- +++ b/.applied_patches_list 2017-12-11 12:38:33.543052804 +0100
- @@ -0,0 +1 @@
- +/home/ru/BUILD/B_IOT/PSG/package/python-ufw/001-set-executable.patch
- diff -Naurp a/setup.py b/setup.py
- --- a/setup.py 2016-02-18 06:26:44.000000000 +0100
- +++ b/setup.py 2017-12-11 12:38:43.075066819 +0100
- @@ -63,6 +63,9 @@ class Install(_install, object):
- real_prefix = self.home + '/usr'
- real_sharedir = os.path.join(real_prefix, 'share', 'ufw')
-
- + br_target_dir = os.environ.get('TARGET_DIR')
- + real_statedir = br_target_dir + real_statedir
- +
- # Update the modules' paths
- for fn in [ 'common.py' ]:
- # 'staging' is used with just 'install' but build_lib is used when
- @@ -123,10 +126,10 @@ class Install(_install, object):
- self.mkpath(os.path.dirname(f))
-
- # update the interpreter to that of the one the user specified for setup
- - print("Updating staging/ufw to use %s" % (sys.executable))
- + print("Updating staging/ufw to use %s" % ('/usr/bin/env python'))
- subprocess.call(["sed",
- "-i",
- - "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g",
- + "1s%^#.*python.*%#! /usr/bin/env " + 'python' + "%g",
- 'staging/ufw'])
- self.copy_file('staging/ufw', script)
- self.copy_file('doc/ufw.8', manpage)
- @@ -158,6 +161,9 @@ class Install(_install, object):
- if self.root != None:
- confdir = self.root + real_confdir
-
- + if br_target_dir != None:
- + confdir = br_target_dir + confdir
- +
- defaults = os.path.join(confdir, 'default', 'ufw')
- ufwconf = os.path.join(confdir, 'ufw', 'ufw.conf')
- sysctl = os.path.join(confdir, 'ufw', 'sysctl.conf')
- @@ -169,13 +175,16 @@ class Install(_install, object):
- user6_rules = os.path.join(confdir, 'ufw', 'user6.rules')
-
- apps_dir = os.path.join(confdir, 'ufw', 'applications.d')
- +
- init_before_hook = os.path.join(confdir, 'ufw', 'before.init')
- init_after_hook = os.path.join(confdir, 'ufw', 'after.init')
-
- for f in [ defaults, ufwconf ]:
- self.mkpath(os.path.dirname(f))
-
- +
- self.mkpath(apps_dir)
- +
- for f in os.listdir('profiles'):
- self.copy_file(os.path.join('profiles', f), apps_dir)
-
|
