Return-Path: Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mail.openembedded.org (Postfix) with ESMTP id AF1C8608DD for ; Mon, 3 Feb 2020 10:20:00 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id w15so17237381wru.4 for ; Mon, 03 Feb 2020 02:20:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gIHWjK6jPCTr+3SEuJ/UjXGj2NoKfGXlBvGuCbDFlkM=; b=p2R1pWAJts2EzFR+LD4Rc2Dl5ocOuMyuC/UqA98aQnzi5gZGS454soKI3JVrJCuaiq kedgaYfRhDVwSTbfAwBGX61dxYn+1oevtlJXP98+Atv8owW8XOwZ91NdK6Wf8ezv0LUO BwDNr6qwtKeTRR8qZ2ZODLBvh+kAbMjs18ggGFfFRZhSb7CBWR6lmxSwvXm3ynljmE22 bzakOHeyK+s201/8lguMTQC0mlZbDaOlCRPU/OeDpuBEBWBDdzwTKDWIGxJmIEf3OTZ0 M9HBP7QtG3vFyvWgDROYstjA7lummKCBKSgGgZi/810SORlZJc11kUyjZqANoPLnQ+5h Tgzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gIHWjK6jPCTr+3SEuJ/UjXGj2NoKfGXlBvGuCbDFlkM=; b=jtmWDyPtwYZ9+TDpt2ZYoZFELzzc6hbSY1oUFrLG6HyrRWwVULZAtizoRkIy+VtjDl EoQ9EwmNBUimmJZ2/VwXjwv++ObUkkJVo8JURuE3QGqyMoJ47jG8enjxrOzOb1Hmuci2 Nszs6XIgOrnO4LryHGIGWeuJ02cwOG2sRD+zU4Pt+ylPZvwMaQahRgepaNqn6D0Vf9c5 ZGn5/kE7B4gx8kjDIFCdMtS4zJaj8wL4WUSODAgkRKVm1pxce1zK4tfG/CBk8zGb3T0T JIETMN2ulvi1KzkttVPORf2Q4gRTM0qKDEje4XtyGsM2lwUXh1MouAVTyEDx56gKJN0F j32w== X-Gm-Message-State: APjAAAUuvXd+UR1cyIcigBZN8jexPBDD3ciNHoJOZU1oMcvk+gxT+QTF RcrSdukeN0F5SxXTOU3ZsISYVcXtYtk= X-Google-Smtp-Source: APXvYqzlcJfGmo4JfK4qx77qcwKNN+8P6HF9xX069q0nRC/H1fFT7t1Lxa9yCT0mL82Wfg6OMSfZPg== X-Received: by 2002:adf:f6c8:: with SMTP id y8mr14289719wrp.167.1580725201101; Mon, 03 Feb 2020 02:20:01 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id a26sm23617825wmm.18.2020.02.03.02.19.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 02:19:59 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 3 Feb 2020 10:19:55 +0000 Message-Id: <20200203101955.2448-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [PATCH] podfix: remove X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Feb 2020 10:20:01 -0000 Content-Transfer-Encoding: 8bit Now that we don't use the host pod2man (oe-core deda455) the podfix class is redundant and can be removed. Signed-off-by: Ross Burton --- meta/classes/podfix.bbclass | 35 ------------------- .../classes/reproducible_build_simple.bbclass | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 meta/classes/podfix.bbclass diff --git a/meta/classes/podfix.bbclass b/meta/classes/podfix.bbclass deleted file mode 100644 index cc8210a27e2..00000000000 --- a/meta/classes/podfix.bbclass +++ /dev/null @@ -1,35 +0,0 @@ -python pod_strip_version() { - import re - - def opener(filename, mode): - if filename.endswith(".gz"): - import gzip - return gzip.open(filename, mode) - elif filename.endswith(".bz2"): - import bz2 - return bz2.open(filename, mode) - else: - return open(filename, mode) - - bad_re = re.compile(rb"Automatically generated by Pod::Man( [0-9]+.+)") - - for root, dirs, files in os.walk(d.expand("${D}${mandir}")): - for filename in files: - filename = os.path.join(root, filename) - if not os.path.isfile(filename): - continue - - with opener(filename, "rb") as manfile: - manpage = manfile.read() - m = bad_re.search(manpage) - if not m: - continue - - bb.note("podfix: stripping version from %s" % filename) - os.unlink(filename) - with opener(filename, "wb") as manfile: - manfile.write(manpage[:m.start(1)]) - manfile.write(manpage[m.end(1):]) -} - -do_install[postfuncs] += "pod_strip_version" diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 153a0760721..3e5fd824328 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -8,5 +8,3 @@ export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" - -inherit podfix -- 2.20.1