From 699b0efba6b2c425266d6ae012c74cf97260a2d5 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 25 May 2020 12:53:06 +0800
Subject: [PATCH] rpm2: cleanup the useless commented lines

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
---
 .../recipes-devtools/rpm/rpm2_4.14.2.bb       | 74 -------------------
 1 file changed, 74 deletions(-)

diff --git a/meta-stx-integ/recipes-devtools/rpm/rpm2_4.14.2.bb b/meta-stx-integ/recipes-devtools/rpm/rpm2_4.14.2.bb
index 91e9fdb..7e56302 100644
--- a/meta-stx-integ/recipes-devtools/rpm/rpm2_4.14.2.bb
+++ b/meta-stx-integ/recipes-devtools/rpm/rpm2_4.14.2.bb
@@ -1,19 +1,3 @@
-
-#SUMMARY = "The RPM package management system"
-#DESCRIPTION = "The RPM Package Manager (RPM) is a powerful command line driven \
-#package management system capable of installing, uninstalling, \
-#verifying, querying, and updating software packages. Each software \
-#package consists of an archive of files along with information about \
-#the package like its version, a description, etc."
-
-#SUMMARY_${PN}-dev = "Development files for manipulating RPM packages"
-#DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \
-#development files will simplify the process of writing programs that \
-#manipulate RPM packages and databases. These files are intended to \
-#simplify the process of creating graphical package managers or any \
-#other tools that need an intimate knowledge of RPM packages in order \
-#to function."
-
 SUMMARY_python2-rpm = "Python bindings for apps which will manupulate RPM packages"
 DESCRIPTION_python2-rpm = "The python2-rpm package contains a module that permits applications \
 written in the Python programming language to use the interface \
@@ -76,49 +60,6 @@ PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils"
 
 ASNEEDED = ""
 
-# Direct rpm-native to read configuration from our sysroot, not the one it was compiled in
-# libmagic also has sysroot path contamination, so override it
-
-#WRAPPER_TOOLS = " \
-#   ${bindir}/rpm \
-#   ${bindir}/rpm2archive \
-#   ${bindir}/rpm2cpio \
-#   ${bindir}/rpmbuild \
-#   ${bindir}/rpmdb \
-#   ${bindir}/rpmgraph \
-#   ${bindir}/rpmkeys \
-#   ${bindir}/rpmsign \
-#   ${bindir}/rpmspec \
-#   ${libdir}/rpm/rpmdeps \
-#"
-
-#do_install_append_class-native() {
-#        for tool in ${WRAPPER_TOOLS}; do
-#                create_wrapper ${D}$tool \
-#                        RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
-#                        RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \
-#                        MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \
-#                        RPM_NO_CHROOT_FOR_SCRIPTS=1
-#        done
-#}
-
-#do_install_append_class-nativesdk() {
-#        for tool in ${WRAPPER_TOOLS}; do
-#                create_wrapper ${D}$tool \
-#                        RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-#                        RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \
-#                        MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \
-#                        RPM_NO_CHROOT_FOR_SCRIPTS=1
-#        done
-#
-#        rm -rf ${D}/var
-#}
-
-# Rpm's make install creates var/tmp which clashes with base-files packaging
-#do_install_append_class-target() {
-#    rm -rf ${D}/var
-#}
-
 do_compile_append () {
 	cd python
 	cp -r ../../git/python/* ./
@@ -151,13 +92,6 @@ do_install_append () {
 		--install-lib=${PYTHON_SITEPACKAGES_DIR}/ --install-data=${datadir}
 }
 
-#FILES_${PN} += "${libdir}/rpm-plugins/*.so \
-#                ${libdir}/rpm \
-#               "
-
-#FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
-#                    "
-
 PACKAGES = "python2-rpm rpm2-dbg"
 PROVIDES = "python2-rpm rpm2-dbg"
 FILES_python2-rpm = " \
@@ -171,11 +105,3 @@ FILES_python2-rpm = " \
 RDEPENDS_${PN} = "bash perl python-core"
 RDEPENDS_python2-rpm = "rpm"
 DEPENDS_python2-rpm = "rpm"
-# PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess"
-
-# Do not specify a sysroot when compiling on a target.
-#rpm_package_preprocess () {
-#	sed -i -e 's:--sysroot[^ ]*::g' \
-#	    ${PKGD}/${libdir}/rpm/macros
-#}
-