diff options
-rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
-rw-r--r-- | conf/distro/openslug.conf | 4 | ||||
-rw-r--r-- | packages/gzip/gzip_1.3.5.bb | 23 | ||||
-rw-r--r-- | packages/ixp425-eth/ixp425-eth_1.1.bb | 21 | ||||
-rw-r--r-- | packages/meta/openslug-native.bb | 3 | ||||
-rw-r--r-- | packages/nis/pwdutils_2.6.bb | 2 | ||||
-rw-r--r-- | packages/nis/ypbind-mt_1.18.bb | 2 | ||||
-rw-r--r-- | packages/nis/ypserv_2.17.bb | 2 | ||||
-rw-r--r-- | packages/pam/libpam_0.79.bb | 9 |
9 files changed, 56 insertions, 12 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 5972afdbf0..11b778db9f 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -157,4 +157,4 @@ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -" +${OPENSLUG_EXTRA_BBFILES}" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dd4d7c0b5b..2d1540333f 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -36,6 +36,10 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" +# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to +# the .bb files for the packages to build - see openslug-packages.conf in this +# directory + # CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb index e99c76dcb4..a138221367 100644 --- a/packages/gzip/gzip_1.3.5.bb +++ b/packages/gzip/gzip_1.3.5.bb @@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" DESCRIPTION = "gzip (GNU zip) is a compression utility designed \ to be a replacement for 'compress'. The GNU Project uses it as \ the standard compression program for its system." +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ file://configure.patch;patch=1" @@ -12,3 +13,25 @@ SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ S = "${WORKDIR}/gzip-${PV}" inherit autotools + +do_install () { + autotools_do_install + # Rename and move files into /bin (FHS) + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 + update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 + update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove gunzip gunzip.${PN} + update-alternatives --remove gzip gzip.${PN} + update-alternatives --remove zcat zcat.${PN} +} + diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 9225cb3df7..a8be7757c3 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -2,12 +2,13 @@ DEPENDS = "ixp4xx-csr patcher-native" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \ + http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \ file://makefile.patch;patch=1 \ file://ethhdr.patch;patch=1 \ file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r5" +PR = "r6" S = "${WORKDIR}" @@ -21,15 +22,15 @@ inherit module KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork" # KERNEL_LD += -do_ixp425_c_patch_fetch () { - if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then - cd ${DL_DIR} - wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 - md5sum > ixp425_eth.c.patch.md5 - fi -} - -addtask ixp425_c_patch_fetch after do_fetch before do_unpack +#do_ixp425_c_patch_fetch () { +# if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then +# cd ${DL_DIR} +# wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 +# md5sum > ixp425_eth.c.patch.md5 +# fi +#} +# +#addtask ixp425_c_patch_fetch after do_fetch before do_unpack do_ixp425_c_patch_unpack () { install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index d61815eb6a..bb5a68d01e 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r6" +PR = "r7" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\ gcc gcc-symlinks \ glibc-extra-nss glibc-utils \ gnu-config \ + gzip \ libc6 libc6-dev \ libg2c-dev \ libgdbm3 \ diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb index 4ba89ffb23..4db798c151 100644 --- a/packages/nis/pwdutils_2.6.bb +++ b/packages/nis/pwdutils_2.6.bb @@ -12,6 +12,8 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # an selinux API is used even if no selinux is detected by # configure. SRC_URI += " file://no-selinux.patch;patch=1" diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index e58daa6670..fb6b0b3621 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -16,6 +16,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. PROVIDES += "ypbind" diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb index 6edb534e8f..c6c564bd50 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -7,6 +7,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypserv needs a database package, gdbm is currently the # only candidate DEPENDS += " gdbm" diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index 8907d9762a..b2fb9deb8f 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -19,6 +19,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL-2" +PR = "r1" # The project is actually called Linux-PAM but that gives # a bad OE package name because of the upper case characters @@ -37,6 +38,14 @@ SRC_URI += " file://libpam-make.patch;patch=1" inherit autotools # EXTRA_OECONF += " --enable-static-libpam" +# Disable building of the documentation - it requires too many different +# programs installed on the build system and is a waste of time. This +# leaves the man documentation in the build. +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2TXT=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2HTML=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2LATEX=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_PS2PDF=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2PS=no" LEAD_SONAME = "libpam.so.*" |