summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/Makefile2
-rw-r--r--core/tasks/kernel.mk3
-rw-r--r--envsetup.sh18
-rw-r--r--tools/releasetools/edify_generator.py2
-rwxr-xr-xtools/releasetools/ota_from_target_files.py2
-rwxr-xr-xtools/repopick.py7
-rwxr-xr-xtools/roomservice.py13
7 files changed, 25 insertions, 22 deletions
diff --git a/core/Makefile b/core/Makefile
index 3ac9b0d..f7ae05b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1922,7 +1922,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
$(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \
$(BUILT_TARGET_FILES_PACKAGE) $@
-CM_TARGET_PACKAGE := $(PRODUCT_OUT)/cm-$(CM_VERSION).zip
+CM_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(CM_VERSION).zip
.PHONY: otapackage bacon
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
index f5a27c0..bc70e38 100644
--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -1,4 +1,5 @@
# Copyright (C) 2012 The CyanogenMod Project
+# (C) 2017 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -162,7 +163,7 @@ ifeq "$(wildcard $(KERNEL_SRC) )" ""
$(warning * THIS IS DEPRECATED, AND WILL BE DISCONTINUED *)
$(warning * Please configure your device to download the kernel *)
$(warning * source repository to $(KERNEL_SRC))
- $(warning * See http://wiki.cyanogenmod.org/w/Doc:_integrated_kernel_building)
+ $(warning * See http://wiki.lineageos.org/w/Doc:_integrated_kernel_building)
$(warning * for more information *)
$(warning ***************************************************************)
FULL_KERNEL_BUILD := false
diff --git a/envsetup.sh b/envsetup.sh
index 6715419..cdbaeec 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -24,8 +24,8 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y
- sepgrep: Greps on all local sepolicy files.
- sgrep: Greps on all local source files.
- godir: Go to the directory containing a file.
-- cmremote: Add git remote for CM Gerrit Review
-- cmgerrit: A Git wrapper that fetches/pushes patch from/to CM Gerrit Review
+- cmremote: Add git remote for LineageOS Gerrit Review
+- cmgerrit: A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review
- cmrebase: Rebase a Gerrit change and push it again
- aospremote: Add git remote for matching AOSP repository
- cafremote: Add git remote for matching CodeAurora repository.
@@ -735,7 +735,7 @@ function eat()
{
if [ "$OUT" ] ; then
MODVERSION=$(get_build_var CM_VERSION)
- ZIPFILE=cm-$MODVERSION.zip
+ ZIPFILE=lineage-$MODVERSION.zip
ZIPPATH=$OUT/$ZIPFILE
if [ ! -f $ZIPPATH ] ; then
echo "Nothing to eat"
@@ -1692,12 +1692,12 @@ function cmremote()
fi
git remote rm cmremote 2> /dev/null
GERRIT_REMOTE=$(git config --get remote.github.projectname)
- CMUSER=$(git config --get review.review.cyanogenmod.org.username)
+ CMUSER=$(git config --get review.review.lineageos.org.username)
if [ -z "$CMUSER" ]
then
- git remote add cmremote ssh://review.cyanogenmod.org:29418/$GERRIT_REMOTE
+ git remote add cmremote ssh://review.lineageos.org:29418/$GERRIT_REMOTE
else
- git remote add cmremote ssh://$CMUSER@review.cyanogenmod.org:29418/$GERRIT_REMOTE
+ git remote add cmremote ssh://$CMUSER@review.lineageos.org:29418/$GERRIT_REMOTE
fi
echo "Remote 'cmremote' created"
}
@@ -1854,7 +1854,7 @@ function cmgerrit() {
$FUNCNAME help
return 1
fi
- local user=`git config --get review.review.cyanogenmod.org.username`
+ local user=`git config --get review.review.lineageos.org.username`
local review=`git config --get remote.github.review`
local project=`git config --get remote.github.projectname`
local command=$1
@@ -2089,7 +2089,7 @@ function cmrebase() {
local dir="$(gettop)/$repo"
if [ -z $repo ] || [ -z $refs ]; then
- echo "CyanogenMod Gerrit Rebase Usage: "
+ echo "LineageOS Gerrit Rebase Usage: "
echo " cmrebase <path to project> <patch IDs on Gerrit>"
echo " The patch IDs appear on the Gerrit commands that are offered."
echo " They consist on a series of numbers and slashes, after the text"
@@ -2111,7 +2111,7 @@ function cmrebase() {
echo "Bringing it up to date..."
repo sync .
echo "Fetching change..."
- git fetch "http://review.cyanogenmod.org/p/$repo" "refs/changes/$refs" && git cherry-pick FETCH_HEAD
+ git fetch "http://review.lineageos.org/p/$repo" "refs/changes/$refs" && git cherry-pick FETCH_HEAD
if [ "$?" != "0" ]; then
echo "Error cherry-picking. Not uploading!"
return
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 825a7eb..8025235 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -151,7 +151,7 @@ class EdifyGenerator(object):
self.script.append(('run_program("/tmp/install/bin/backuptool.sh", "%s");' % command))
def ValidateSignatures(self, command):
- self.script.append('package_extract_file("META-INF/org/cyanogenmod/releasekey", "/tmp/releasekey");')
+ self.script.append('package_extract_file("META-INF/org/lineageos/releasekey", "/tmp/releasekey");')
# Exit code 124 == abort. run_program returns raw, so left-shift 8bit
self.script.append('run_program("/tmp/install/bin/otasigcheck.sh") != "31744" || abort("Can\'t install this package on top of incompatible data. Please try another package or run a factory reset");')
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index bc40873..e483b1c 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -753,7 +753,7 @@ endif;
common.ZipWriteStr(output_zip, "system/build.prop",
""+input_zip.read("SYSTEM/build.prop"))
- common.ZipWriteStr(output_zip, "META-INF/org/cyanogenmod/releasekey",
+ common.ZipWriteStr(output_zip, "META-INF/org/lineageos/releasekey",
""+input_zip.read("META/releasekey.txt"))
def WritePolicyConfig(file_name, output_zip):
diff --git a/tools/repopick.py b/tools/repopick.py
index cfbb8a8..9bb39aa 100755
--- a/tools/repopick.py
+++ b/tools/repopick.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
#
# Copyright (C) 2013-15 The CyanogenMod Project
+# (C) 2017 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -121,12 +122,12 @@ def fetch_query(remote_url, query):
raise Exception('Gerrit URL should be in the form http[s]://hostname/ or ssh://[user@]host[:port]')
if __name__ == '__main__':
- # Default to CyanogenMod Gerrit
- default_gerrit = 'http://review.cyanogenmod.org'
+ # Default to LineageOS Gerrit
+ default_gerrit = 'http://review.lineageos.org'
parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, description=textwrap.dedent('''\
repopick.py is a utility to simplify the process of cherry picking
- patches from CyanogenMod's Gerrit instance (or any gerrit instance of your choosing)
+ patches from LineageOS's Gerrit instance (or any gerrit instance of your choosing)
Given a list of change numbers, repopick will cd into the project path
and cherry pick the latest patch available.
diff --git a/tools/roomservice.py b/tools/roomservice.py
index a1b69cd..5393907 100755
--- a/tools/roomservice.py
+++ b/tools/roomservice.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# Copyright (C) 2012-2013, The CyanogenMod Project
+# (C) 2017, The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -51,7 +52,7 @@ except:
device = product
if not depsonly:
- print("Device %s not found. Attempting to retrieve device repository from CyanogenMod Github (http://github.com/CyanogenMod)." % device)
+ print("Device %s not found. Attempting to retrieve device repository from LineageOS Github (http://github.com/LineageOS)." % device)
repositories = []
@@ -71,7 +72,7 @@ def add_auth(githubreq):
githubreq.add_header("Authorization","Basic %s" % githubauth)
if not depsonly:
- githubreq = urllib.request.Request("https://api.github.com/search/repositories?q=%s+user:CyanogenMod+in:name+fork:true" % device)
+ githubreq = urllib.request.Request("https://api.github.com/search/repositories?q=%s+user:LineageOS+in:name+fork:true" % device)
add_auth(githubreq)
try:
result = json.loads(urllib.request.urlopen(githubreq).read().decode())
@@ -175,12 +176,12 @@ def add_to_manifest(repositories, fallback_branch = None):
repo_target = repository['target_path']
print('Checking if %s is fetched from %s' % (repo_target, repo_name))
if is_in_manifest(repo_target):
- print('CyanogenMod/%s already fetched to %s' % (repo_name, repo_target))
+ print('LineageOS/%s already fetched to %s' % (repo_name, repo_target))
continue
- print('Adding dependency: CyanogenMod/%s -> %s' % (repo_name, repo_target))
+ print('Adding dependency: LineageOS/%s -> %s' % (repo_name, repo_target))
project = ElementTree.Element("project", attrib = { "path": repo_target,
- "remote": "github", "name": "CyanogenMod/%s" % repo_name })
+ "remote": "github", "name": "LineageOS/%s" % repo_name })
if 'branch' in repository:
project.set('revision',repository['branch'])
@@ -294,4 +295,4 @@ else:
print("Done")
sys.exit()
-print("Repository for %s not found in the CyanogenMod Github repository list. If this is in error, you may need to manually add it to your local_manifests/roomservice.xml." % device)
+print("Repository for %s not found in the LineageOS Github repository list. If this is in error, you may need to manually add it to your local_manifests/roomservice.xml." % device)
generated by cgit v1.1 at 2024-12-22 13:05:25 +0000