From 0344771b53541ef651c2da637790ef19bb62d2b0 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Mon, 19 Dec 2016 11:22:55 -0600 Subject: [PATCH] vendor: we are now LineageOS * Change necessary bits to support our project move Change-Id: I085470d448a243cc9d60b4ce920dee52086f64cd --- CHANGELOG.mkdn | 6 +++--- CONTRIBUTORS.mkdn | 4 ++-- LICENSE | 1 + README.mkdn | 18 ++++++++--------- build/core/apicheck_msg_current.txt | 4 ++-- build/envsetup.sh | 20 +++++++++---------- build/tasks/kernel.mk | 3 ++- build/tools/roomservice.py | 13 ++++++------ config/common.mk | 2 +- .../base/core/res/res/values/config.xml | 3 ++- prebuilt/common/bin/50-cm.sh | 2 +- prebuilt/common/etc/init.d/00banner | 11 ++++++---- vendorsetup.sh | 2 +- 13 files changed, 48 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn index e4e2ae82..872a8063 100644 --- a/CHANGELOG.mkdn +++ b/CHANGELOG.mkdn @@ -1,9 +1,9 @@ -CyanogenMod +LineageOS =============== -Visit http://github.com/CyanogenMod for full source and git access. +Visit http://github.com/LineageOS for full source and git access. -Visit http://review.cyanogenmod.org for our Gerrit instance. +Visit http://review.lineageos.org for our Gerrit instance. CHANGELOG (notable new features) --------- diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index c9abef7a..b1338871 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -1,7 +1,7 @@ -CyanogenMod +LineageOS =========== -Maintainers (CyanogenMod 14.1): +Maintainers (LineageOS 14.1): ----------------------------- * __Acer A700:__ pawitp * __Alcatel Idol 3:__ c457 diff --git a/LICENSE b/LICENSE index 69f49a5e..cdec959c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright 2011-15 The CyanogenMod Project + 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. diff --git a/README.mkdn b/README.mkdn index f40dd1f1..822d7060 100644 --- a/README.mkdn +++ b/README.mkdn @@ -1,9 +1,9 @@ -CyanogenMod +LineageOS =========== Submitting Patches ------------------ -Patches are always welcome! Please submit your patches via CyanogenMod Gerrit! +Patches are always welcome! Please submit your patches via LineageOS Gerrit! You can do this by using these commands: (From root android directory) @@ -20,31 +20,31 @@ For more help on using this tool, use this command: repo help upload Make your changes and commit with a detailed message, starting with what you are working with (i.e. vision: Update Kernel) Commit your patches in a single commit. Squash multiple commit using this command: git rebase -i HEAD~<# of commits> -To view the status of your and others' patches, visit [CyanogenMod Code Review](http://review.cyanogenmod.org/) +To view the status of your and others' patches, visit [LineageOS Code Review](http://review.lineageos.org/) Getting Started --------------- -To get started with Android/CyanogenMod, you'll need to get +To get started with Android/LineageOS, you'll need to get familiar with [Repo](https://source.android.com/source/using-repo.html) and [Version Control with Git](https://source.android.com/source/version-control.html). -To initialize your local repository using the CyanogenMod trees, use a command like this: +To initialize your local repository using the LineageOS trees, use a command like this: - repo init -u git://github.com/CyanogenMod/android.git -b cm-14.1 + repo init -u git://github.com/LineageOS/android.git -b cm-14.1 Then to sync up: repo sync -Please see the [CyanogenMod Wiki](http://wiki.cyanogenmod.org/) for building instructions, by device. +Please see the [LineageOS Wiki](http://wiki.lineageos.org/) for building instructions, by device. For more information on this Github Organization and how it is structured, -please [read the wiki article](http://wiki.cyanogenmod.org/w/Github_Organization) +please [read the wiki article](http://wiki.lineageos.org/w/Github_Organization) Buildbot -------- All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable. -You can view the current build statuses in the [Jenkins](http://jenkins.cyanogenmod.org) tool. +You can view the current build statuses in the [Jenkins](http://jenkins.lineageos.org) tool. diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt index 05a0341e..6881b3f9 100644 --- a/build/core/apicheck_msg_current.txt +++ b/build/core/apicheck_msg_current.txt @@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved. STOP. Read this: - https://github.com/CyanogenMod/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api + https://github.com/LineageOS/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api To make these errors go away, you have two choices: 1) You can add "@hide" javadoc comments to the methods, etc. listed in the @@ -142,6 +142,6 @@ To make these errors go away, you have two choices: ,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:. ..,;;+++++++++++++++++++++++++++++;:,. - To submit the revised current.txt to the main CyanogenMod repository, + To submit the revised current.txt to the main LineageOS repository, you will need approval. ****************************** diff --git a/build/envsetup.sh b/build/envsetup.sh index 282c0fdb..4f668b11 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -1,15 +1,15 @@ function __print_cm_functions_help() { cat < /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" } @@ -401,7 +401,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 @@ -636,7 +636,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 " 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" @@ -658,7 +658,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/build/tasks/kernel.mk b/build/tasks/kernel.mk index 0b85b19b..c4ddebf9 100644 --- a/build/tasks/kernel.mk +++ b/build/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/build/tools/roomservice.py b/build/tools/roomservice.py index e7ba8f76..2c1c8135 100755 --- a/build/tools/roomservice.py +++ b/build/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']) @@ -298,4 +299,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) diff --git a/config/common.mk b/config/common.mk index c6858976..29ae162d 100644 --- a/config/common.mk +++ b/config/common.mk @@ -1,4 +1,4 @@ -PRODUCT_BRAND ?= cyanogenmod +PRODUCT_BRAND ?= LineageOS ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space)) # determine the smaller dimension diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml index c39a02c3..8e3fbc0f 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -1,6 +1,7 @@