Fix the policy templates handling
Basically revert my previous commits as the policy templates are generated during the build. The only thing that we were copying out from the tarballs was the policy templates documentation, but that one is generated as well so use that one and remove the policy_templates zip file from sources
This commit is contained in:
parent
3f324a0af1
commit
2abf30d2cc
@ -209,33 +209,6 @@ def download_chrome_latest_rpm(arch):
|
||||
remove_file_if_exists (chrome_rpm)
|
||||
sys.exit(1)
|
||||
|
||||
def remove_and_download_latest_policy_templates(version_string):
|
||||
|
||||
policy_file = 'policy_templates.zip'
|
||||
if version_string != 'stable':
|
||||
if version_string == 'unstable':
|
||||
policy_file = "dev_" + policy_file
|
||||
else:
|
||||
policy_file = version_string + "_" + policy_file
|
||||
|
||||
path = 'https://dl.google.com/chrome/policy/%s' % policy_file
|
||||
remove_file_if_exists(policy_file)
|
||||
|
||||
# Let's make sure we haven't already downloaded it.
|
||||
if os.path.isfile("./%s" % policy_file):
|
||||
print "%s already exists!" % policy_file
|
||||
else:
|
||||
print "Downloading %s" % path
|
||||
# Perhaps look at using python-progressbar at some point?
|
||||
info=urllib.urlretrieve(path, policy_file, reporthook=dlProgress)[1]
|
||||
urllib.urlcleanup()
|
||||
print ""
|
||||
if (info["Content-Type"] != "application/octet-stream"):
|
||||
print 'Policy templates are not on servers.' % version_string
|
||||
remove_file_if_exists (policy_file)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
# This is where the magic happens
|
||||
if __name__ == '__main__':
|
||||
|
||||
@ -321,9 +294,6 @@ if __name__ == '__main__':
|
||||
|
||||
download_version(chromium_version)
|
||||
|
||||
# Always download the newest policy templates
|
||||
remove_and_download_latest_policy_templates(version_string)
|
||||
|
||||
# Lets make sure we haven't unpacked it already
|
||||
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
|
||||
if (args.clean and os.path.isdir(latest_dir)):
|
||||
|
@ -247,7 +247,6 @@ Source7: get_free_ffmpeg_source_files.py
|
||||
Source8: get_linux_tests_names.py
|
||||
# GNOME stuff
|
||||
Source9: chromium-browser.xml
|
||||
Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
|
||||
Source11: chrome-remote-desktop@.service
|
||||
Source13: master_preferences
|
||||
|
||||
@ -617,7 +616,6 @@ without support for alsa, cups, dbus, gconf, gio, kerberos, pulseaudio, or
|
||||
udev.
|
||||
|
||||
%prep
|
||||
%setup -q -T -c -n %{name}-policies -a 10
|
||||
%setup -q -T -c -n depot_tools -a 2
|
||||
%if 0%{tests}
|
||||
%setup -q -n chromium-%{version} -b 1
|
||||
@ -1317,10 +1315,8 @@ sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desk
|
||||
# Add directories for policy management
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/recommended
|
||||
cp -a ../%{name}-policies/common/html/en-US/*.html .
|
||||
|
||||
# linux json files no longer in .zip file
|
||||
#cp -a ../%{name}-policies/linux/examples/*.json .
|
||||
cp -a out/Release/gen/chrome/app/policy/common/html/en-US/*.html .
|
||||
cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json .
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
|
||||
|
1
sources
1
sources
@ -1,3 +1,2 @@
|
||||
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
|
||||
SHA512 (policy_templates.zip) = a7e07808a5a053e9e32fe879630ac227369f46e730b6155a570ae096e65e802297a6e635d325886720e55d06ea68ab598bc6b361ede84e61e5e0e577fd4c38fb
|
||||
SHA512 (chromium-62.0.3202.62-clean.tar.xz) = 5151cdd4cc9f5735984ea16615311dbec759d62496b619fa5a04e06e08821ccba7f11e2d1835e2020edcb783150cc7f1880e62084ae9f69057fabea0459e147b
|
||||
|
Loading…
x
Reference in New Issue
Block a user