[yocto] [meta-baryon] [PATCH 2/2] webmin: update package to 1.590
Kevin Strasser
kevin.strasser at linux.intel.com
Mon Aug 6 14:05:16 PDT 2012
The patch "fdisk-partprobe-fix.patch" has been accepted upstream
and is no longer needed.
Signed-off-by: Kevin Strasser <kevin.strasser at linux.intel.com>
---
.../webmin/files/fdisk-partprobe-fix.patch | 16 ---
recipes-extended/webmin/webmin_1.570.bb | 147 --------------------
recipes-extended/webmin/webmin_1.590.bb | 146 +++++++++++++++++++
3 files changed, 146 insertions(+), 163 deletions(-)
delete mode 100644 recipes-extended/webmin/files/fdisk-partprobe-fix.patch
delete mode 100644 recipes-extended/webmin/webmin_1.570.bb
create mode 100644 recipes-extended/webmin/webmin_1.590.bb
diff --git a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch
deleted file mode 100644
index 2279c96..0000000
--- a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fix prepending partprobe command in fdisk module library code
-#
-# Upstream-status: Pending
-#
-# Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---- webmin-1.570.orig/fdisk/fdisk-lib.pl
-+++ webmin-1.570/fdisk/fdisk-lib.pl
-@@ -940,7 +940,7 @@ elsif ($_[0] eq "fatx") {
- $cmd = "mkfs -t $_[0] $_[1]";
- }
- if (&has_command("partprobe")) {
-- $cmd .= "partprobe ; $cmd";
-+ $cmd = "partprobe ; $cmd";
- }
- return $cmd;
- }
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
deleted file mode 100644
index c09bbac..0000000
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ /dev/null
@@ -1,147 +0,0 @@
-DESCRIPTION = "Web-based administration interface"
-HOMEPAGE="http://www.webmin.com"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c"
-
-# FIXME: some of this should be figured out automatically
-RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict"
-RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-module-xsloader perl-module-posix perl-module-autoloader"
-RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
-RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
-
-PR = "r13"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
- file://setup.sh \
- file://init-exclude.patch \
- file://net-generic.patch \
- file://fdisk-partprobe-fix.patch \
- file://remove-startup-option.patch \
- file://disable-version-check.patch \
- file://nfs-export.patch \
- file://exports-lib.pl.patch \
- file://mount-excludefs.patch \
- file://samba-config-fix.patch \
- file://proftpd-config-fix.patch \
- file://net-lib.pl.patch \
- file://media-tomb.patch"
-
-SRC_URI[md5sum] = "20b4f488637366c39458b9b93162eff3"
-SRC_URI[sha256sum] = "3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54"
-
-inherit allarch perlnative update-rc.d
-
-do_configure() {
- # Remove binaries and plugins for other platforms
- rm -rf acl/Authen-SolarisRBAC-0.1*
- rm -rf format bsdexports hpuxexports sgiexports
- rm -rf zones rbac smf ipfw ipfilter dfsadmin
- rm -f mount/freebsd-mounts* mount/netbsd-mounts*
- rm -f mount/openbsd-mounts* mount/macos-mounts*
-
- # Remove some plugins for the moment
- rm -rf lilo frox wuftpd telnet pserver cpan shorewall webalizer cfengine fsdump pap
- rm -rf majordomo fetchmail sendmail mailboxes procmail filter mailcap dovecot exim spam qmailadmin postfix
- rm -rf stunnel squid sarg pptp-client pptp-server jabber openslp sentry cluster-* vgetty burner heartbeat
-
- # Adjust configs
- mv init/config-debian-linux init/config-generic-linux
- sed -i "s/shutdown_command=.*/shutdown_command=poweroff/" init/config-generic-linux
- echo "exclude=bootmisc.sh,single,halt,reboot,hostname.sh,modutils.sh,mountall.sh,mountnfs.sh,networking,populate-volatile.sh,rmnologin.sh,save-rtc.sh,umountfs,umountnfs.sh,hwclock.sh,checkroot.sh,banner.sh,udev,udev-cache,devpts.sh,psplash.sh,sendsigs,fbsetup,bootlogd,stop-bootlogd,sysfs.sh,syslog,syslog.busybox,urandom,webmin,functions.initscripts" >> init/config-generic-linux
- echo "excludefs=devpts,devtmpfs,usbdevfs,proc,tmpfs,sysfs" >> mount/config-generic-linux
-
- mv exports/config-debian-linux exports/config-generic-linux
- sed -i "s/killall -HUP rpc.nfsd && //" exports/config-generic-linux
- sed -i "s/netstd_nfs/nfsserver/g" exports/config-generic-linux
-
- # Fix insane naming that causes problems at packaging time (must be done before deleting below)
- find . -name "*\**" | while read from
- do
- to=`echo "$from" | sed "s/*/ALL/"`
- mv "$from" "$to"
- done
-
- # Remove some other files we don't need
- find . -name "config-*" -a \! -name "config-generic-linux" -a \! -name "config-ALL-linux" -a \! -name "*.pl" -delete
- find . -regextype posix-extended -regex ".*/(openserver|aix|osf1|osf|openbsd|netbsd|freebsd|unixware|solaris|macos|irix|hpux|cygwin|windows)-lib\.pl" -delete
- rm -f webmin-gentoo-init webmin-caldera-init webmin-debian-pam webmin-pam
-
- # Don't need these at runtime (and we have our own setup script)
- rm -f setup.sh
- rm -f setup.pl
-
- # Use pidof for finding PIDs
- sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
-}
-
-INITSCRIPT_NAME = "webmin"
-INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ."
-
-do_install() {
- install -d ${D}${sysconfdir}
- install -d ${D}${sysconfdir}/webmin
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin
-
- install -d ${D}${localstatedir}
- install -d ${D}${localstatedir}/webmin
-
- install -d ${D}${libexecdir}/webmin
- cp -pPR ${S}/* ${D}${libexecdir}/webmin
- rm -f ${D}${libexecdir}/webmin/webmin-init
- rm -rf ${D}${libexecdir}/webmin/patches
-
- # Run setup script
- export perl=perl
- export perl_runtime=${bindir}/perl
- export prefix=${D}
- export tempdir=${S}/install_tmp
- export wadir=${libexecdir}/webmin
- export config_dir=${sysconfdir}/webmin
- export var_dir=${localstatedir}/webmin
- export os_type=generic-linux
- export os_version=0
- export real_os_type="${DISTRO_NAME}"
- export real_os_version="${DISTRO_VERSION}"
- export port=10000
- export login=admin
- export password=password
- export ssl=0
- export atboot=1
- export no_pam=1
- mkdir -p $tempdir
- ${S}/../setup.sh
-}
-
-PACKAGES_DYNAMIC += "webmin-module-*"
-RRECOMMENDS_${PN} += "webmin-module-system-status"
-
-RDEPENDS_webmin-module-proc = "procps"
-RDEPENDS_webmin-module-raid = "mdadm"
-RDEPENDS_webmin-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix"
-RRECOMMENDS_webmin-module-fdisk = "parted"
-RRECOMMENDS_webmin-module-lvm = "lvm2"
-
-python populate_packages_prepend() {
- import os, os.path
-
- wadir = bb.data.expand('${libexecdir}/webmin', d)
- wadir_image = bb.data.expand('${D}', d) + wadir
- modules = []
- for mod in os.listdir(wadir_image):
- modinfo = os.path.join(wadir_image, mod, "module.info")
- if os.path.exists(modinfo):
- modules.append(mod)
-
- do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True)
-}
-
-# Time-savers
-EXCLUDE_FROM_SHLIBS = "1"
-split_and_strip_files() {
- :
-}
-
-package_do_pkgconfig() {
- :
-}
diff --git a/recipes-extended/webmin/webmin_1.590.bb b/recipes-extended/webmin/webmin_1.590.bb
new file mode 100644
index 0000000..e380eb1
--- /dev/null
+++ b/recipes-extended/webmin/webmin_1.590.bb
@@ -0,0 +1,146 @@
+DESCRIPTION = "Web-based administration interface"
+HOMEPAGE="http://www.webmin.com"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c"
+
+# FIXME: some of this should be figured out automatically
+RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict"
+RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-module-xsloader perl-module-posix perl-module-autoloader"
+RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
+RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
+ file://setup.sh \
+ file://init-exclude.patch \
+ file://net-generic.patch \
+ file://remove-startup-option.patch \
+ file://disable-version-check.patch \
+ file://nfs-export.patch \
+ file://exports-lib.pl.patch \
+ file://mount-excludefs.patch \
+ file://samba-config-fix.patch \
+ file://proftpd-config-fix.patch \
+ file://net-lib.pl.patch \
+ file://media-tomb.patch"
+
+SRC_URI[md5sum] = "815005ed7f208dcfbda5308b446779c2"
+SRC_URI[sha256sum] = "07b06612a8bc864388d86b55ec9a9adba0fa71ec60cc66d87c0e58280264182d"
+
+inherit allarch perlnative update-rc.d
+
+do_configure() {
+ # Remove binaries and plugins for other platforms
+ rm -rf acl/Authen-SolarisRBAC-0.1*
+ rm -rf format bsdexports hpuxexports sgiexports
+ rm -rf zones rbac smf ipfw ipfilter dfsadmin
+ rm -f mount/freebsd-mounts* mount/netbsd-mounts*
+ rm -f mount/openbsd-mounts* mount/macos-mounts*
+
+ # Remove some plugins for the moment
+ rm -rf lilo frox wuftpd telnet pserver cpan shorewall webalizer cfengine fsdump pap
+ rm -rf majordomo fetchmail sendmail mailboxes procmail filter mailcap dovecot exim spam qmailadmin postfix
+ rm -rf stunnel squid sarg pptp-client pptp-server jabber openslp sentry cluster-* vgetty burner heartbeat
+
+ # Adjust configs
+ mv init/config-debian-linux init/config-generic-linux
+ sed -i "s/shutdown_command=.*/shutdown_command=poweroff/" init/config-generic-linux
+ echo "exclude=bootmisc.sh,single,halt,reboot,hostname.sh,modutils.sh,mountall.sh,mountnfs.sh,networking,populate-volatile.sh,rmnologin.sh,save-rtc.sh,umountfs,umountnfs.sh,hwclock.sh,checkroot.sh,banner.sh,udev,udev-cache,devpts.sh,psplash.sh,sendsigs,fbsetup,bootlogd,stop-bootlogd,sysfs.sh,syslog,syslog.busybox,urandom,webmin,functions.initscripts" >> init/config-generic-linux
+ echo "excludefs=devpts,devtmpfs,usbdevfs,proc,tmpfs,sysfs" >> mount/config-generic-linux
+
+ mv exports/config-debian-linux exports/config-generic-linux
+ sed -i "s/killall -HUP rpc.nfsd && //" exports/config-generic-linux
+ sed -i "s/netstd_nfs/nfsserver/g" exports/config-generic-linux
+
+ # Fix insane naming that causes problems at packaging time (must be done before deleting below)
+ find . -name "*\**" | while read from
+ do
+ to=`echo "$from" | sed "s/*/ALL/"`
+ mv "$from" "$to"
+ done
+
+ # Remove some other files we don't need
+ find . -name "config-*" -a \! -name "config-generic-linux" -a \! -name "config-ALL-linux" -a \! -name "*.pl" -delete
+ find . -regextype posix-extended -regex ".*/(openserver|aix|osf1|osf|openbsd|netbsd|freebsd|unixware|solaris|macos|irix|hpux|cygwin|windows)-lib\.pl" -delete
+ rm -f webmin-gentoo-init webmin-caldera-init webmin-debian-pam webmin-pam
+
+ # Don't need these at runtime (and we have our own setup script)
+ rm -f setup.sh
+ rm -f setup.pl
+
+ # Use pidof for finding PIDs
+ sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
+}
+
+INITSCRIPT_NAME = "webmin"
+INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ."
+
+do_install() {
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/webmin
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin
+
+ install -d ${D}${localstatedir}
+ install -d ${D}${localstatedir}/webmin
+
+ install -d ${D}${libexecdir}/webmin
+ cp -pPR ${S}/* ${D}${libexecdir}/webmin
+ rm -f ${D}${libexecdir}/webmin/webmin-init
+ rm -rf ${D}${libexecdir}/webmin/patches
+
+ # Run setup script
+ export perl=perl
+ export perl_runtime=${bindir}/perl
+ export prefix=${D}
+ export tempdir=${S}/install_tmp
+ export wadir=${libexecdir}/webmin
+ export config_dir=${sysconfdir}/webmin
+ export var_dir=${localstatedir}/webmin
+ export os_type=generic-linux
+ export os_version=0
+ export real_os_type="${DISTRO_NAME}"
+ export real_os_version="${DISTRO_VERSION}"
+ export port=10000
+ export login=admin
+ export password=password
+ export ssl=0
+ export atboot=1
+ export no_pam=1
+ mkdir -p $tempdir
+ ${S}/../setup.sh
+}
+
+PACKAGES_DYNAMIC += "webmin-module-*"
+RRECOMMENDS_${PN} += "webmin-module-system-status"
+
+RDEPENDS_webmin-module-proc = "procps"
+RDEPENDS_webmin-module-raid = "mdadm"
+RDEPENDS_webmin-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix"
+RRECOMMENDS_webmin-module-fdisk = "parted"
+RRECOMMENDS_webmin-module-lvm = "lvm2"
+
+python populate_packages_prepend() {
+ import os, os.path
+
+ wadir = bb.data.expand('${libexecdir}/webmin', d)
+ wadir_image = bb.data.expand('${D}', d) + wadir
+ modules = []
+ for mod in os.listdir(wadir_image):
+ modinfo = os.path.join(wadir_image, mod, "module.info")
+ if os.path.exists(modinfo):
+ modules.append(mod)
+
+ do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True)
+}
+
+# Time-savers
+EXCLUDE_FROM_SHLIBS = "1"
+split_and_strip_files() {
+ :
+}
+
+package_do_pkgconfig() {
+ :
+}
--
1.7.9.5
More information about the yocto
mailing list