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

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`)

pmb/aportgen/device.py

@@ -179,7 +179,7 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
             handle.write(line.lstrip() + "\n")
 
 
-def generate_apkbuild(args, pkgname, name, manufacturer, arch, flash_method):
+def generate_apkbuild(args, pkgname, name, arch, flash_method):
     depends = "linux-" + "-".join(pkgname.split("-")[1:])
     if flash_method in ["fastboot", "heimdall-bootimg"]:
         depends += " mkbootimg"
@@ -188,7 +188,7 @@ def generate_apkbuild(args, pkgname, name, manufacturer, arch, flash_method):
     content = """\
         # Reference: <https://postmarketos.org/devicepkg>
         pkgname=\"""" + pkgname + """\"
-        pkgdesc=\"""" + manufacturer + " " + name + """\"
+        pkgdesc=\"""" + name + """\"
         pkgver=0.1
         pkgrel=0
         url="https://postmarketos.org"
@@ -230,4 +230,4 @@ def generate(args, pkgname):
 
     generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
                         has_external_storage, flash_method, bootimg)
-    generate_apkbuild(args, pkgname, name, manufacturer, arch, flash_method)
+    generate_apkbuild(args, pkgname, name, arch, flash_method)

pmb/aportgen/linux.py

@@ -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"])

test/test_aportgen_device_wizard.py

@@ -112,16 +112,16 @@ def test_aportgen_device_wizard(args, monkeypatch):
     # First run
     deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
     assert apkbuild["pkgname"] == "device-testsuite-testdevice"
-    assert apkbuild["pkgdesc"] == "Testsuite Testsuite Testdevice"
+    assert apkbuild["pkgdesc"] == "Testsuite Testdevice"
     assert apkbuild["depends"] == ["linux-testsuite-testdevice"]
 
     assert apkbuild_linux["pkgname"] == "linux-testsuite-testdevice"
-    assert apkbuild_linux["pkgdesc"] == "Testsuite Testsuite Testdevice kernel fork"
+    assert apkbuild_linux["pkgdesc"] == "Testsuite Testdevice kernel fork"
     assert apkbuild_linux["arch"] == ["armhf"]
     assert apkbuild_linux["_flavor"] == "testsuite-testdevice"
 
     assert deviceinfo["name"] == "Testsuite Testdevice"
-    assert deviceinfo["manufacturer"] == "Testsuite"
+    assert deviceinfo["manufacturer"] == answers["Manufacturer"]
     assert deviceinfo["arch"] == "armhf"
     assert deviceinfo["keyboard"] == "false"
     assert deviceinfo["external_disk"] == "true"