Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Revert "init: Add manufacturer to pkgdesc when creating new device (#913)" (#1083)

Browse source 
This reverts commit 99d7b58ee5.

People usually add manufacturer name in the phone full name which
results in having manufacturer written double in pkdesc (e.g. `Samsung
Samsung Galaxy Mini 2`)
This commit is contained in:
Piotr Halama 2018-01-05 03:44:44 +01:00 • committed by Oliver Smith
parent 2619effe93
commit 2c5cd5d8bb
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pmb/aportgen/linux.py
View file

@ -22,7 +22,7 @@ import pmb.parse.apkindex
import pmb.parse.arch
def generate_apkbuild(args, pkgname, manufacturer, name, arch):
def generate_apkbuild(args, pkgname, name, arch):
device = "-".join(pkgname.split("-")[1:])
carch = pmb.parse.arch.alpine_to_kernel(arch)
content = """\
@ -31,7 +31,7 @@ def generate_apkbuild(args, pkgname, manufacturer, name, arch):
pkgname=\"""" + pkgname + """\"
pkgver=3.x.x
pkgrel=0
pkgdesc=\"""" + manufacturer + " " + name + """ kernel fork\"
pkgdesc=\"""" + name + """ kernel fork\"
arch=\"""" + arch + """\"
_carch=\"""" + carch + """\"
_flavor=\"""" + device + """\"
@ -126,5 +126,4 @@ def generate(args, pkgname):
"/device/linux-lg-mako/" + file,
args.work + "/aportgen/"])
generate_apkbuild(args, pkgname, deviceinfo["manufacturer"],
deviceinfo["name"], deviceinfo["arch"])
generate_apkbuild(args, pkgname, deviceinfo["name"], deviceinfo["arch"])