diff options
| author | hschang <chang@dev3> | 2017-11-20 07:40:29 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2017-11-20 08:34:10 (GMT) |
| commit | 14398e339246f9c5f77d74b099e7b032b768ecb1 (patch) | |
| tree | 98f4a1605b8728fe2bd0fbe7ab8b67e4c9cfe170 /meta-openvuplus | |
| parent | cfa11c9b7fa53a61e45052baef5075ea217dfcc7 (diff) | |
[dvbapp] use e2label to automount storage devices.
Diffstat (limited to 'meta-openvuplus')
4 files changed, 13 insertions, 8 deletions
diff --git a/meta-openvuplus/recipes-core/udev/udev-182/automount.py b/meta-openvuplus/recipes-core/udev/udev-182/automount.py index 22f81e2..05848d2 100755 --- a/meta-openvuplus/recipes-core/udev/udev-182/automount.py +++ b/meta-openvuplus/recipes-core/udev/udev-182/automount.py @@ -7,11 +7,15 @@ def readFile(fn): return open(fn, "r").read() def getLabelFromDevName(dev_kernel): - for label in glob.glob("/dev/disk/by-label/*"): - realPath = os.path.realpath(label) - if realPath == dev_kernel: - return os.path.basename(label) - return None + data = None + try: + data = os.popen("e2label %s" % dev_kernel).read().strip() + if not data: + data = None + except: + data = None + + return data def getModel(dev_base): model = None diff --git a/meta-openvuplus/recipes-core/udev/udev_182.bbappend b/meta-openvuplus/recipes-core/udev/udev_182.bbappend index f6a4d97..d2b4fa3 100644 --- a/meta-openvuplus/recipes-core/udev/udev_182.bbappend +++ b/meta-openvuplus/recipes-core/udev/udev_182.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus4" +PR .= "-vuplus5" SRC_URI += " \ file://99_vuplus.rules \ diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 672adfa..5cdf510 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -232,7 +232,7 @@ DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugle RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libvugles2" , "", d)}" PN = "enigma2" -PR = "r168" +PR = "r169" inherit gitpkgv pythonnative diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb index 240d21c..90f7e00 100644 --- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb +++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb @@ -2,7 +2,7 @@ SUMMARY = "Vuplus: Base set of packages for Vuplus." SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -PR = "r6" +PR = "r7" inherit packagegroup @@ -12,6 +12,7 @@ VUPLUS_BASE_ESSENTIAL = "\ vuplus-compat \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ + e2fsprogs-tune2fs \ fakelocale \ opkg \ tzdata \ |