File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,7 +19,9 @@ Command will output the FreeBSD make command output. Outputs the following files
1919
2020- ` pfsense-api/pfSense-pkg-API/Makefile ` : The rendered Makefile
2121- ` pfsense-api/pfSense-pkg-API/pkg-plist ` : The rendered pkg-plist
22- - ` pfsense-api/pfSense-pkg-API/pfSense-pkg-API-<VERSION>.txz ` : The FreeBSD package distribution file
22+ - ` pfsense-api/pfSense-pkg-API/pfSense-pkg-API-<VERSION>.txz ` : The FreeBSD package distribution file. On FreeBSD 11,
23+ this should be located in the ` pfsense-api/pfSense-pkg-API ` directory after completion. On FreeBSD 12 it should be
24+ located in the ` pfsense-api/pfSense-pkg-API/work/pkg ` directory.
2325
2426### Notes
2527- This script heavily depends on it's relative filepaths. You may execute the script from any directory, but do not move
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ def dirname(path):
1919excluded_files = ["pkg-deinstall.in" , "pkg-install.in" , "etc" , "usr" ]
2020
2121# Set Jijna2 environment and variables
22- j2_env = jinja2 .Environment (loader = jinja2 .FileSystemLoader (searchpath = template_dir ))
22+ j2_env = jinja2 .Environment (loader = jinja2 .FileSystemLoader (searchpath = str ( template_dir ) ))
2323j2_env .filters ["dirname" ] = dirname
2424plist_template = j2_env .get_template ("pkg-plist.j2" )
2525makefile_template = j2_env .get_template ("Makefile.j2" )
@@ -29,10 +29,10 @@ def dirname(path):
2929 root = pathlib .Path (str (root ).replace (str (files_dir ), "" ))
3030 for dir in dirs :
3131 if dir not in excluded_files :
32- file_paths ["dir" ].append (root .joinpath (dir ))
32+ file_paths ["dir" ].append (str ( root .joinpath (dir ) ))
3333 for file in files :
3434 if file not in excluded_files :
35- file_paths ["file" ].append (root .joinpath (file ))
35+ file_paths ["file" ].append (str ( root .joinpath (file ) ))
3636
3737# Generate pkg-plist file
3838with open (pkg_dir .joinpath ("pkg-plist" ), "w" ) as pw :
You can’t perform that action at this time.
0 commit comments