* [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b
@ 2012-08-06 21:05 Kevin Strasser
2012-08-06 21:05 ` [meta-baryon] [PATCH 2/2] webmin: update package to 1.590 Kevin Strasser
2012-09-06 13:25 ` [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Paul Eggleton
0 siblings, 2 replies; 3+ messages in thread
From: Kevin Strasser @ 2012-08-06 21:05 UTC (permalink / raw)
To: yocto
The contrib directory now contains its own Makefile which is
used during installation. It was required to pass in the DESTDIR
variable.
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
recipes-extended/proftpd/files/contrib.patch | 25 ++++++++++++
recipes-extended/proftpd/proftpd_1.3.3c.bb | 53 -------------------------
recipes-extended/proftpd/proftpd_1.3.4b.bb | 54 ++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 53 deletions(-)
create mode 100644 recipes-extended/proftpd/files/contrib.patch
delete mode 100644 recipes-extended/proftpd/proftpd_1.3.3c.bb
create mode 100644 recipes-extended/proftpd/proftpd_1.3.4b.bb
diff --git a/recipes-extended/proftpd/files/contrib.patch b/recipes-extended/proftpd/files/contrib.patch
new file mode 100644
index 0000000..d97cd69
--- /dev/null
+++ b/recipes-extended/proftpd/files/contrib.patch
@@ -0,0 +1,25 @@
+DESTDIR needs to be passed through to the contrib Makefile
+
+Upstream-Status: Pending
+
+Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5b2e683..ee72fe1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
+ test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install)
+
+ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
+- cd contrib/ && $(MAKE) install-utils
++ cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils
+ $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount
+ $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl
+ $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+--
+1.7.9.5
+
diff --git a/recipes-extended/proftpd/proftpd_1.3.3c.bb b/recipes-extended/proftpd/proftpd_1.3.3c.bb
deleted file mode 100644
index 8de80fc..0000000
--- a/recipes-extended/proftpd/proftpd_1.3.3c.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Secure ftp daemon"
-SECTION = "console/network"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a"
-
-PR = "r0"
-
-SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
- file://make.patch \
- file://basic.conf.patch \
- "
-
-SRC_URI[md5sum] = "4f2c554d6273b8145095837913ba9e5d"
-SRC_URI[sha256sum] = "44be095ed063df93278928cf665ad7b9b38e2c8d0cca97fb51307ec3a390a591"
-
-EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes --disable-cap"
-LDFLAGS += "-Llib"
-PARALLEL_MAKE = ""
-
-do_configure () {
- ./configure \
- --disable-auth-pam \
- --build=${BUILD_SYS} \
- --host=${HOST_SYS} \
- --target=${TARGET_SYS} \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sharedstatedir=/com \
- --localstatedir=/var \
- ${EXTRA_OECONF} \
- $@;
-}
-
-do_install () {
- oe_runmake DESTDIR=${D} install
-}
-
-pkg_postinst () {
- if [ "x$D" != "x" ] ; then
- exit 1
- fi
-
- # more chown's might be needed
- chown root:root /usr/sbin/proftpd
-
- # create the ftp user
- username='ftp'
- addgroup ${username}
- adduser --disabled-password ${username} --ingroup ${username}
- mkdir -p /home/${username}/pub/
- chown -R ftp:ftp /home/${username}/pub
-}
diff --git a/recipes-extended/proftpd/proftpd_1.3.4b.bb b/recipes-extended/proftpd/proftpd_1.3.4b.bb
new file mode 100644
index 0000000..b7e201b
--- /dev/null
+++ b/recipes-extended/proftpd/proftpd_1.3.4b.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
+ file://make.patch \
+ file://basic.conf.patch \
+ file://contrib.patch \
+ "
+
+SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"
+SRC_URI[sha256sum] = "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb"
+
+EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes --disable-cap"
+LDFLAGS += "-Llib"
+PARALLEL_MAKE = ""
+
+do_configure () {
+ ./configure \
+ --disable-auth-pam \
+ --build=${BUILD_SYS} \
+ --host=${HOST_SYS} \
+ --target=${TARGET_SYS} \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sharedstatedir=/com \
+ --localstatedir=/var \
+ ${EXTRA_OECONF} \
+ $@;
+}
+
+do_install () {
+ oe_runmake DESTDIR=${D} install
+}
+
+pkg_postinst () {
+ if [ "x$D" != "x" ] ; then
+ exit 1
+ fi
+
+ # more chown's might be needed
+ chown root:root /usr/sbin/proftpd
+
+ # create the ftp user
+ username='ftp'
+ addgroup ${username}
+ adduser --disabled-password ${username} --ingroup ${username}
+ mkdir -p /home/${username}/pub/
+ chown -R ftp:ftp /home/${username}/pub
+}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-baryon] [PATCH 2/2] webmin: update package to 1.590
2012-08-06 21:05 [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Kevin Strasser
@ 2012-08-06 21:05 ` Kevin Strasser
2012-09-06 13:25 ` [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Paul Eggleton
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Strasser @ 2012-08-06 21:05 UTC (permalink / raw)
To: yocto
The patch "fdisk-partprobe-fix.patch" has been accepted upstream
and is no longer needed.
Signed-off-by: Kevin Strasser <kevin.strasser@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@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b
2012-08-06 21:05 [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Kevin Strasser
2012-08-06 21:05 ` [meta-baryon] [PATCH 2/2] webmin: update package to 1.590 Kevin Strasser
@ 2012-09-06 13:25 ` Paul Eggleton
1 sibling, 0 replies; 3+ messages in thread
From: Paul Eggleton @ 2012-09-06 13:25 UTC (permalink / raw)
To: Kevin Strasser; +Cc: yocto
On Monday 06 August 2012 14:05:15 Kevin Strasser wrote:
> The contrib directory now contains its own Makefile which is
> used during installation. It was required to pass in the DESTDIR
> variable.
>
> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> ---
> recipes-extended/proftpd/files/contrib.patch | 25 ++++++++++++
> recipes-extended/proftpd/proftpd_1.3.3c.bb | 53
> ------------------------- recipes-extended/proftpd/proftpd_1.3.4b.bb |
> 54 ++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 53
> deletions(-)
> create mode 100644 recipes-extended/proftpd/files/contrib.patch
> delete mode 100644 recipes-extended/proftpd/proftpd_1.3.3c.bb
> create mode 100644 recipes-extended/proftpd/proftpd_1.3.4b.bb
>
> diff --git a/recipes-extended/proftpd/files/contrib.patch
> b/recipes-extended/proftpd/files/contrib.patch new file mode 100644
> index 0000000..d97cd69
> --- /dev/null
> +++ b/recipes-extended/proftpd/files/contrib.patch
> @@ -0,0 +1,25 @@
> +DESTDIR needs to be passed through to the contrib Makefile
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> +---
> + Makefile.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index 5b2e683..ee72fe1 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir)
> $(DESTDIR)$(sysconfdir) + test -z "$(SHARED_MODULE_OBJS)" -a -z
> "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ &&
> $(MAKE) install) +
> + install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
> +- cd contrib/ && $(MAKE) install-utils
> ++ cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils
> + $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount
> + $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl
> + $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
> +--
> +1.7.9.5
> +
> diff --git a/recipes-extended/proftpd/proftpd_1.3.3c.bb
> b/recipes-extended/proftpd/proftpd_1.3.3c.bb deleted file mode 100644
> index 8de80fc..0000000
> --- a/recipes-extended/proftpd/proftpd_1.3.3c.bb
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -DESCRIPTION = "Secure ftp daemon"
> -SECTION = "console/network"
> -
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a"
> -
> -PR = "r0"
> -
> -SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
> - file://make.patch \
> - file://basic.conf.patch \
> - "
> -
> -SRC_URI[md5sum] = "4f2c554d6273b8145095837913ba9e5d"
> -SRC_URI[sha256sum] =
> "44be095ed063df93278928cf665ad7b9b38e2c8d0cca97fb51307ec3a390a591" -
> -EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes
> --disable-cap" -LDFLAGS += "-Llib"
> -PARALLEL_MAKE = ""
> -
> -do_configure () {
> - ./configure \
> - --disable-auth-pam \
> - --build=${BUILD_SYS} \
> - --host=${HOST_SYS} \
> - --target=${TARGET_SYS} \
> - --prefix=/usr \
> - --sysconfdir=/etc \
> - --sharedstatedir=/com \
> - --localstatedir=/var \
> - ${EXTRA_OECONF} \
> - $@;
> -}
> -
> -do_install () {
> - oe_runmake DESTDIR=${D} install
> -}
> -
> -pkg_postinst () {
> - if [ "x$D" != "x" ] ; then
> - exit 1
> - fi
> -
> - # more chown's might be needed
> - chown root:root /usr/sbin/proftpd
> -
> - # create the ftp user
> - username='ftp'
> - addgroup ${username}
> - adduser --disabled-password ${username} --ingroup ${username}
> - mkdir -p /home/${username}/pub/
> - chown -R ftp:ftp /home/${username}/pub
> -}
> diff --git a/recipes-extended/proftpd/proftpd_1.3.4b.bb
> b/recipes-extended/proftpd/proftpd_1.3.4b.bb new file mode 100644
> index 0000000..b7e201b
> --- /dev/null
> +++ b/recipes-extended/proftpd/proftpd_1.3.4b.bb
> @@ -0,0 +1,54 @@
> +DESCRIPTION = "Secure ftp daemon"
> +SECTION = "console/network"
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
> +
> +PR = "r0"
> +
> +SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
> + file://make.patch \
> + file://basic.conf.patch \
> + file://contrib.patch \
> + "
> +
> +SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"
> +SRC_URI[sha256sum] =
> "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb" +
> +EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes
> --disable-cap" +LDFLAGS += "-Llib"
> +PARALLEL_MAKE = ""
> +
> +do_configure () {
> + ./configure \
> + --disable-auth-pam \
> + --build=${BUILD_SYS} \
> + --host=${HOST_SYS} \
> + --target=${TARGET_SYS} \
> + --prefix=/usr \
> + --sysconfdir=/etc \
> + --sharedstatedir=/com \
> + --localstatedir=/var \
> + ${EXTRA_OECONF} \
> + $@;
> +}
> +
> +do_install () {
> + oe_runmake DESTDIR=${D} install
> +}
> +
> +pkg_postinst () {
> + if [ "x$D" != "x" ] ; then
> + exit 1
> + fi
> +
> + # more chown's might be needed
> + chown root:root /usr/sbin/proftpd
> +
> + # create the ftp user
> + username='ftp'
> + addgroup ${username}
> + adduser --disabled-password ${username} --ingroup ${username}
> + mkdir -p /home/${username}/pub/
> + chown -R ftp:ftp /home/${username}/pub
> +}
Sorry for the late reply Kevin. Would you mind re-sending these two using -M
so that the changes are obvious?
Thanks,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-06 13:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-06 21:05 [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Kevin Strasser
2012-08-06 21:05 ` [meta-baryon] [PATCH 2/2] webmin: update package to 1.590 Kevin Strasser
2012-09-06 13:25 ` [meta-baryon] [PATCH 1/2] proftpd: update package to 1.3.4b Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.