* Re: Addition of the Coyote Linux distro and HAProxy
2009-03-30 5:10 Addition of the Coyote Linux distro and HAProxy Joshua Jackson
@ 2009-03-30 5:11 ` Joshua Jackson
2009-03-30 6:56 ` Khem Raj
2009-03-30 5:22 ` Tom Rini
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Joshua Jackson @ 2009-03-30 5:11 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 89 bytes --]
Helps if I actually attach a patch file...
--
Joshua Jackson
Vortech Consulting, LLC
[-- Attachment #2: add-coyote-haproxy.patch --]
[-- Type: application/octet-stream, Size: 8737 bytes --]
diff --exclude .git -uNr openembedded-vanilla/conf/checksums.ini openembedded/conf/checksums.ini
--- openembedded-vanilla/conf/checksums.ini 2009-03-30 00:33:47.000000000 -0400
+++ openembedded/conf/checksums.ini 2009-03-30 00:22:26.000000000 -0400
@@ -1,3 +1,7 @@
+[http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.17.tar.gz]
+md5=423ad955828a2de1803410a4405696f2
+sha256=347f238250f03b202857ea24a3ebd75465b689d8c45c5347032c501e2e971877
+
[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
md5=c6a2705f6210d8ede50a947b375f1c0b
sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
diff --exclude .git -uNr openembedded-vanilla/conf/distro/coyote.conf openembedded/conf/distro/coyote.conf
--- openembedded-vanilla/conf/distro/coyote.conf 1969-12-31 19:00:00.000000000 -0500
+++ openembedded/conf/distro/coyote.conf 2009-03-30 00:40:11.000000000 -0400
@@ -0,0 +1,97 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Coyote
+#@DESCRIPTION: Coyote Linux Distribution Configuration
+#
+#@COMMENT: This distribution configuration is used for Coyote Linux v4
+#############################################################################
+
+DISTRO_NAME = "coyote"
+#DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_VERSION="4.0b1"
+DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+#PR = "1"
+
+# Ensure some form of release config, so error out if someone thinks he knows better
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+
+DISTRO_FEATURES = "ext2 squashfs"
+
+INHERIT += "debian"
+
+INHERIT += "packaged-staging"
+
+# Chose the packaging system
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "squashfs ext2 tar.gz"
+
+require conf/distro/include/sane-feed.inc
+PREFERRED_PKG_FORMAT ?= "ipk"
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+IPKG_VARIANT = "opkg-nogpg"
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6.29"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+PREFERRED_LIBC = "glibc"
+
+require conf/distro/include/sane-toolchain.inc
+
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_virtual/db = "db3"
+PREFERRED_PROVIDER_virtual/db-native = "db3-native"
+
+
+#PREFERRED_PROVIDER_avahi = "avahi"
+#PREFERRED_PROVIDER_gconf = "gconf-dbus"
+#PREFERRED_PROVIDER_gtk+ = "gtk+"
+#PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
+#PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#require conf/distro/include/preferred-e-versions.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#PREFERRED_VERSION_mono = "1.9.1+2.2-rc1"
+#PREFERRED_VERSION_mono = "svn"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-cross = "2.5"
+PREFERRED_VERSION_glibc-cross-sdk = "2.5"
+PREFERRED_VERSION_glibc-cross-initial = "2.5"
+PREFERRED_VERSION_glibc-cross-intermediate = "2.5"
+
+PREFERRED_VERSION_linux = "2.6.29"
+
+
+#############################################################################
+# CONTENTS
+#############################################################################
+
+# Ship extra debug utils in the rootfs when doing a debug build
+#DISTRO_EXTRA_APPS ?= ""
+#DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
diff --exclude .git -uNr openembedded-vanilla/recipes/haproxy/files/haproxy.conf openembedded/recipes/haproxy/files/haproxy.conf
--- openembedded-vanilla/recipes/haproxy/files/haproxy.conf 1969-12-31 19:00:00.000000000 -0500
+++ openembedded/recipes/haproxy/files/haproxy.conf 2009-03-30 00:43:38.000000000 -0400
@@ -0,0 +1,28 @@
+global
+ log 127.0.0.1 local0
+ log 127.0.0.1 local1 notice
+ maxconn 4096
+ #chroot /home/haproxy
+ #uid 508
+ #gid 508
+ daemon
+
+defaults
+ log global
+ mode http
+ option httplog
+ option dontlognull
+ option forwardfor
+ retries 3
+ option redispatch
+ maxconn 2000
+ contimeout 5000
+ clitimeout 50000
+ srvtimeout 50000
+ stats enable
+
+listen stats :8888
+ mode http
+ balance source
+ stats uri /
+
diff --exclude .git -uNr openembedded-vanilla/recipes/haproxy/files/init openembedded/recipes/haproxy/files/init
--- openembedded-vanilla/recipes/haproxy/files/init 1969-12-31 19:00:00.000000000 -0500
+++ openembedded/recipes/haproxy/files/init 2009-03-30 00:55:26.000000000 -0400
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# haproxy init.d script for haproxy
+#
+# You *must* create or update the /etc/haproxy/haproxy.conf file for
+# this to work properly
+CONF=/etc/haproxy/haproxy.conf
+PIDFILE=/var/run/haproxy.pid
+
+case "$1" in
+ start)
+ echo -n "Starting haproxy: "
+ start-stop-daemon --start -x /usr/bin/haproxy -- -D -f "${CONF}" -p "${PIDFILE}" "$@"
+ echo "done"
+ ;;
+ stop)
+ echo -n "Stopping haproxy: "
+ start-stop-daemon --stop -s 3 -p "${PIDFILE}"
+ echo "done"
+ ;;
+ restart|reload)
+ echo -n "Restarting haproxy: "
+ start-stop-daemon --stop -s 3 -p "${PIDFILE}"
+ start-stop-daemon --start -x /usr/bin/haproxy -- -D -f "${CONF}" -p "${PIDFILE}" "$@"
+ echo "done"
+ ;;
+ *)
+ echo "haproxy: haproxy { start | stop | restart | reload }" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --exclude .git -uNr openembedded-vanilla/recipes/haproxy/files/Makefile.patch openembedded/recipes/haproxy/files/Makefile.patch
--- openembedded-vanilla/recipes/haproxy/files/Makefile.patch 1969-12-31 19:00:00.000000000 -0500
+++ openembedded/recipes/haproxy/files/Makefile.patch 2009-03-29 23:59:21.000000000 -0400
@@ -0,0 +1,20 @@
+--- haproxy/Makefile.orig 2009-03-29 23:55:04.000000000 -0400
++++ haproxy/Makefile 2009-03-29 23:56:55.000000000 -0400
+@@ -60,7 +60,7 @@
+
+ #### Installation options.
+ DESTDIR =
+-PREFIX = /usr/local
++PREFIX = /usr
+ SBINDIR = $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/share/man
+ DOCDIR = $(PREFIX)/doc/haproxy
+@@ -70,7 +70,7 @@
+ # following list (use the default "generic" if uncertain) :
+ # generic, linux22, linux24, linux24e, linux26, solaris,
+ # freebsd, openbsd, custom
+-TARGET =
++TARGET = linux26
+
+ #### TARGET CPU
+ # Use CPU=<cpu_name> to optimize for a particular CPU, among the following
diff --exclude .git -uNr openembedded-vanilla/recipes/haproxy/haproxy_1.3.17.bb openembedded/recipes/haproxy/haproxy_1.3.17.bb
--- openembedded-vanilla/recipes/haproxy/haproxy_1.3.17.bb 1969-12-31 19:00:00.000000000 -0500
+++ openembedded/recipes/haproxy/haproxy_1.3.17.bb 2009-03-30 00:01:06.000000000 -0400
@@ -0,0 +1,34 @@
+# HAProxy from haproxy.1wt.eu
+DESCRIPTION = "A TCP/HTTP load balancer"
+HOMEPAGE = "http://haproxy.1wt.eu/"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.17.tar.gz"
+SRC_URI += "file://init"
+SRC_URI += "file://haproxy.conf"
+SRC_URI += "file://Makefile.patch;patch=1"
+
+INITSCRIPT_NAME = "haproxy"
+# No dependencies, so just go in at the standard level (20)
+INITSCRIPT_PARAMS = "defaults"
+
+# The configuration file must be edited...
+CONFFILES_${PN} = "${sysconfdir}/haproxy/haproxy.conf"
+
+inherit autotools update-rc.d
+
+PACKAGES += "haproxy"
+
+do_compile() {
+ oe_runmake TARGET=linux26 PREFIX=/usr
+}
+
+do_install_append() {
+ install -d "${D}${sysconfdir}/init.d"
+ install -c -m 755 ${WORKDIR}/init "${D}${sysconfdir}/init.d/haproxy"
+ install -d "${D}${sysconfdir}/haproxy"
+ install -c -m 644 ${WORKDIR}/haproxy.conf "${D}${sysconfdir}/haproxy/haproxy.conf"
+}
^ permalink raw reply [flat|nested] 6+ messages in thread