summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/debianslug.conf1
-rw-r--r--conf/distro/openslug.conf1
-rw-r--r--conf/distro/slugos-packages.conf2
-rw-r--r--packages/altboot/altboot.bb4
-rw-r--r--packages/altboot/files/altboot.func58
-rw-r--r--packages/altboot/files/init.altboot2
-rw-r--r--packages/device-mapper/device-mapper-1.01.05/.mtn2git_empty0
-rw-r--r--packages/device-mapper/device-mapper-1.01.05/devmap-mknod-busybox.patch9
-rw-r--r--packages/device-mapper/device-mapper_1.01.05.bb33
-rw-r--r--packages/ftpd-topfield/ftpd-topfield_0.6.1.bb39
-rwxr-xr-x[-rw-r--r--]packages/ftpd-topfield/ftpd-topfield_0.6.3.bb (renamed from packages/ftpd-topfield/ftpd-topfield_0.5.2.bb)10
-rw-r--r--packages/lvm2/lvm2_2.01.15.bb16
-rw-r--r--packages/meta/slugos-packages.bb2
13 files changed, 94 insertions, 83 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index f23eced80e..e496398c33 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -109,6 +109,7 @@ kernel-module-nls-utf8 \
# a bootable, useable, system however they *are* expected to be present
# in DebianSlug - see slugos-lag for a more minimal configuration and some
# more instructions about how to make a non-debianslug image.
+DEBIANSLUG_EXTRA_RDEPENDS ?= ""
SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS} ${DEBIANSLUG_EXTRA_RDEPENDS}"
#----------------------------------------------------------------------------------
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 8317f1d325..f5b5e75a60 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -109,6 +109,7 @@ kernel-module-nls-utf8 \
# a bootable, useable, system however they *are* expected to be present
# in OpenSlug - see nslu2-bag for a more minimal configuration and some
# more instructions about how to make a non-openslug image.
+OPENSLUG_EXTRA_RDEPENDS ?= ""
SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS} ${OPENSLUG_EXTRA_RDEPENDS}"
#----------------------------------------------------------------------------------
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index e559e3e70e..57743c670f 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -32,6 +32,7 @@ ${PKGDIR}/packages/cyrus-sasl/*.bb \
${PKGDIR}/packages/db/*.bb \
${PKGDIR}/packages/dbus/*.bb \
${PKGDIR}/packages/devio/*.bb \
+${PKGDIR}/packages/device-mapper/*.bb \
${PKGDIR}/packages/diffstat/*.bb \
${PKGDIR}/packages/diffutils/*.bb \
${PKGDIR}/packages/dnsmasq/*.bb \
@@ -109,6 +110,7 @@ ${PKGDIR}/packages/linux/*.bb \
${PKGDIR}/packages/lirc/*.bb \
${PKGDIR}/packages/lrzsz/*.bb \
${PKGDIR}/packages/lsof/*.bb \
+${PKGDIR}/packages/lvm2/*.bb \
${PKGDIR}/packages/lzo/*.bb \
${PKGDIR}/packages/m4/*.bb \
${PKGDIR}/packages/madplay/*.bb \
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index 3d1ca8216a..8912cc1bec 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD or CF. \
+DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \
Tested machines: Collie, Poodle, Akita, Spitz"
SECTION = "base"
PRIORITY = "optional"
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 1c21a5f2f8..e1196ecc7f 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -67,30 +67,7 @@ pivot_realfs() {
mount -o remount,ro /
- echo -n "Pivoting root..."
- if (/sbin/pivot_root $1 $1/media/ROM)
- then
- echo "Success"
-
- # Interestingly, this doesn't work with the "real" mount
- # Without this command, /dev would be mounted under /media/ROM/dev after pivoting root
- /bin/busybox mount -o move /media/ROM/dev /dev
-
- cd /
-
- # Boot /sbin/init if it is available or use /sbin/init.sysvinit instead
- if test -x $/sbin/init
- then
- echo "Calling INIT [/sbin/init $RL]"
- exec /usr/sbin/chroot . /sbin/init $RL >/dev/tty0 2>&1
- else
- echo "Calling INIT [$REAL_INIT $RL]"
- exec /usr/sbin/chroot . $REAL_INIT $RL >/dev/tty0 2>&1
- fi
- else
- echo "FAILED"
- die "* * * pivot_root failed! * * *"
- fi
+ do_pivot "$1" "$RL"
}
# This function loop-mounts an image-file and pivot_root's into it
@@ -153,12 +130,17 @@ pivot_image() {
fi
# If mount fails it has the tendency to spew out a _lot_ of error messages.
# We direct the output to /dev/null so the user can see which step actually failed.
- mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
+ mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
+ do_pivot /media/image "$RL"
+}
+
+#$1=mountpoint of the soon-to-be rootfs, $2=Runlevel
+do_pivot(){
echo -n "Pivoting root..."
- if (/sbin/pivot_root /media/image /media/image/media/ROM)
+ if (/sbin/pivot_root "$1" "$1/media/ROM")
then
echo "Success"
@@ -169,18 +151,28 @@ pivot_image() {
# Move mountpoints from the old rootfs into the new one.
# The *real* mount is kinda touchy feely about that
- /bin/busybox mount -o move /media/ROM$1 $1
- /bin/busybox mount -o move /media/ROM/dev /dev
- /bin/busybox mount -o move /media/ROM/proc /proc >/dev/null 2>&1
+ /bin/busybox mount -o move /media/ROM/proc /proc >/dev/null 2>&1
+ for mpt in ` mount | grep "/media/ROM/" | awk '{print $3}'`
+ do
+ new_mpt="`echo "$mpt" | sed -n "s/\/media\/ROM//p"`"
+
+ echo "Moving mountpoint [$mpt] -> [$new_mpt]" >/dev/tty0 2>&1
+
+ ! test -d "$new_mpt" && mkdir -p "$new_mpt"
+ /bin/busybox mount -o move "$mpt" "$new_mpt"
+ done
+
echo "Calling INIT"
- exec /usr/sbin/chroot . /sbin/init $RL >/dev/tty0 2>&1
+
+ #read junk
+
+ exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1
else
echo "FAILED"
die "* * * pivot_root failed! * * *"
fi
-
}
# This functions configures the master password for altboot if none is set
@@ -188,11 +180,9 @@ set_password() {
mount -o remount,rw /
if test -z "$MASTER_PASSWORD"
then
- echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF and NFS"
+ echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF, USB-Storage and NFS"
echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh."
echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}\n"
- #echo -e "${C_BLUE}\nNote:\tThe password will be echoed to the screen\n\tand it will be asked twice for confirmation.${C_RESET}"
- #echo -e "\nPlease enter a new master password:\n"
while true
do
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 5bc833d2b1..7304ee4da1 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -8,7 +8,7 @@
test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
CURRENT_ENV="`set`"
-VERSION="0.0.3"
+VERSION="0.0.4"
# Set some defaults in case altboot.cfg is missing
REAL_INIT="/sbin/init.sysvinit"
diff --git a/packages/device-mapper/device-mapper-1.01.05/.mtn2git_empty b/packages/device-mapper/device-mapper-1.01.05/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/device-mapper/device-mapper-1.01.05/.mtn2git_empty
diff --git a/packages/device-mapper/device-mapper-1.01.05/devmap-mknod-busybox.patch b/packages/device-mapper/device-mapper-1.01.05/devmap-mknod-busybox.patch
new file mode 100644
index 0000000000..8b24f143dd
--- /dev/null
+++ b/packages/device-mapper/device-mapper-1.01.05/devmap-mknod-busybox.patch
@@ -0,0 +1,9 @@
+--- device-mapper.1.01.05/scripts/devmap_mknod.sh 2002-07-23 05:50:13.000000000 -0700
++++ device-mapper.1.01.05/scripts/devmap_mknod.sh~ 2005-08-25 14:51:13.000000000 -0700
+@@ -37,5 +37,5 @@
+ test -e $CONTROL && rm -f $CONTROL
+
+ echo "Creating $CONTROL character device with major:$MAJOR minor:$MINOR."
+-mknod --mode=600 $CONTROL c $MAJOR $MINOR
++mknod -m 600 $CONTROL c $MAJOR $MINOR
+
diff --git a/packages/device-mapper/device-mapper_1.01.05.bb b/packages/device-mapper/device-mapper_1.01.05.bb
new file mode 100644
index 0000000000..fc0efb1670
--- /dev/null
+++ b/packages/device-mapper/device-mapper_1.01.05.bb
@@ -0,0 +1,33 @@
+SECTION = "libs"
+DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
+that supports logical volume management. It is required by LVM2 and EVMS. \
+The original LVM (included in stock 2.4 kernels) does not use it."
+MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
+LICENSE = "GPL"
+PR = "r2"
+
+S = "${WORKDIR}/${PN}.${PV}"
+
+SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \
+ file://devmap-mknod-busybox.patch;patch=1"
+
+inherit autotools update-rc.d
+
+# The install-script will fail without this.
+EXTRA_OECONF="--with-user= --with-group= "
+
+INITSCRIPT_NAME = "devmap_mknod.sh"
+INITSCRIPT_PARAMS = "defaults"
+
+do_stage () {
+ install -m 0644 ${S}/lib/libdevmapper.h ${STAGING_INCDIR} || die "failed to install libdevmapper.h"
+ oe_libinstall -a -so -C lib/ioctl libdevmapper ${STAGING_LIBDIR}
+}
+
+do_install() {
+ autotools_do_install
+# oe_runmake install_static_lib
+ install -d ${D}/${libdir}/ioctl
+ install -m 755 ${S}/lib/ioctl/libdevmapper.a ${D}/${libdir}/ioctl/
+ install -D -m 755 ${S}/scripts/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+}
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
deleted file mode 100644
index c93e8c2120..0000000000
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-# This package builds the ftpd-topfield program
-PR = "r0"
-DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
-HOMEPAGE = "http://sourceforge.net/projects/puppy"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
-SECTION = "net"
-LICENSE = "MIT"
-
-DEPENDS = "libusb"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_1 \
- cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_1 \
- file://init"
-
-# The source will end up in the subdirectory 'ftpd-topfield' - no release name
-S = "${WORKDIR}/ftpd-topfield"
-SL = "${WORKDIR}/libtopfield"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "ftpd-topfield"
-INITSCRIPT_PARAMS = "defaults"
-
-# Just the one package at present
-PACKAGES = "${PN}"
-
-inherit autotools
-
-do_compile() {
- oe_runmake -C ${SL} libtopfield.a
- oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb"
-}
-
-do_install() {
- install -d ${D}${sbindir}
- install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield
- install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
- install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield
-}
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb
index 6a6665c8ed..72cf5ab057 100644..100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb
@@ -6,15 +6,12 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
SECTION = "net"
LICENSE = "MIT"
-DEPENDS = "libusb"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \
- cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_3 \
+ cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_3 \
file://init"
# The source will end up in the subdirectory 'ftpd-topfield' - no release name
S = "${WORKDIR}/ftpd-topfield"
-SL = "${WORKDIR}/libtopfield"
inherit update-rc.d
@@ -27,8 +24,7 @@ PACKAGES = "${PN}"
inherit autotools
do_compile() {
- oe_runmake -C ${SL} libtopfield.a
- oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb"
+ oe_runmake
}
do_install() {
diff --git a/packages/lvm2/lvm2_2.01.15.bb b/packages/lvm2/lvm2_2.01.15.bb
new file mode 100644
index 0000000000..80a4a0c84b
--- /dev/null
+++ b/packages/lvm2/lvm2_2.01.15.bb
@@ -0,0 +1,16 @@
+SECTION = "utils"
+DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
+MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
+LICENSE = "GPL"
+PR = ""
+DEPENDS = "device-mapper"
+
+S = "${WORKDIR}/LVM2.${PV}"
+
+SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz"
+
+# Unset user/group to unbreak install.
+EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct"
+EXTRA_OECONF_arm = "--with-user= --with-group= --disable-o_direct"
+inherit autotools
+
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 267f99a82e..e09852295a 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -88,6 +88,7 @@ SLUGOS_PACKAGES = "\
libxml2 \
lrzsz \
lsof \
+ lvm2 \
m4 \
mailx \
make \
@@ -180,6 +181,7 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
# These packages work with glibc, but break on uclibc.
UCLIBC_BROKEN_PACKAGES = "\
alsa-utils \
+ memtester \
"
# Packages which build only with glibc (some of these use internal
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-09 02:52:00 +0000