diff --git a/srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs b/srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs index 7c868f98388..03a743dce49 100644 --- a/srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs +++ b/srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs @@ -1,2 +1,4 @@ +libpam_misc.so.0 +libpam.so.0 libm.so.6 libc.so.6 diff --git a/srcpkgs/base-system-live-busybox/files/dotconfig b/srcpkgs/base-system-live-busybox/files/dotconfig index 151a549cb1e..f8f7765725f 100644 --- a/srcpkgs/base-system-live-busybox/files/dotconfig +++ b/srcpkgs/base-system-live-busybox/files/dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.1 -# Sat Jun 2 10:33:34 2012 +# Busybox version: 1.20.2 +# Wed Aug 29 10:29:59 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -80,11 +80,11 @@ CONFIG_NO_DEBUG_LIB=y # # Installation Options ("make install" behavior) # -CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_SYMLINKS is not set # CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS=y # CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +CONFIG_INSTALL_SH_APPLET_SYMLINK=y # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set CONFIG_PREFIX="./_install" @@ -462,12 +462,12 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_DELGROUP is not set # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set CONFIG_GETTY=y -# CONFIG_LOGIN is not set -# CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set +CONFIG_LOGIN=y +CONFIG_LOGIN_SESSION_AS_CHILD=y +CONFIG_PAM=y +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y # CONFIG_PASSWD is not set # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set @@ -476,15 +476,15 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set +CONFIG_SULOGIN=y # CONFIG_VLOCK is not set # # Linux Ext2 FS Progs # -CONFIG_CHATTR=y +# CONFIG_CHATTR is not set CONFIG_FSCK=y -CONFIG_LSATTR=y +# CONFIG_LSATTR is not set # CONFIG_TUNE2FS is not set # @@ -531,8 +531,8 @@ CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_REV=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -541,7 +541,7 @@ CONFIG_FEATURE_FBSET_READMODE=y CONFIG_FDFLUSH=y CONFIG_FDFORMAT=y CONFIG_FDISK=y -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -570,7 +570,7 @@ CONFIG_IPCRM=y CONFIG_IPCS=y CONFIG_LOSETUP=y CONFIG_LSPCI=y -# CONFIG_LSUSB is not set +CONFIG_LSUSB=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y @@ -602,7 +602,7 @@ CONFIG_FEATURE_UMOUNT_ALL=y # CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_FEATURE_MTAB_SUPPORT=y CONFIG_VOLUMEID=y # diff --git a/srcpkgs/base-system-live-busybox/patches/mount_strictatime.patch b/srcpkgs/base-system-live-busybox/patches/mount_strictatime.patch new file mode 100644 index 00000000000..b530ac832e2 --- /dev/null +++ b/srcpkgs/base-system-live-busybox/patches/mount_strictatime.patch @@ -0,0 +1,22 @@ +Add support for strictatime mount option. + +https://bugs.busybox.net/show_bug.cgi?id=5474 + +--- util-linux/mount.c.orig 2012-08-29 16:30:19.164282575 +0200 ++++ util-linux/mount.c 2012-08-29 16:30:03.088660739 +0200 +@@ -235,6 +235,7 @@ static const int32_t mount_options[] = { + /* "noatime" */ MS_NOATIME, + /* "diratime" */ ~MS_NODIRATIME, + /* "nodiratime" */ MS_NODIRATIME, ++ /* "strictatime" */ MS_STRICTATIME, + /* "mand" */ MS_MANDLOCK, + /* "nomand" */ ~MS_MANDLOCK, + /* "relatime" */ MS_RELATIME, +@@ -291,6 +292,7 @@ static const char mount_option_str[] = + "noatime\0" + "diratime\0" + "nodiratime\0" ++ "strictatime\0" + "mand\0" + "nomand\0" + "relatime\0" diff --git a/srcpkgs/base-system-live-busybox/template b/srcpkgs/base-system-live-busybox/template index c73ccb0f5c4..58b6d5e30ad 100644 --- a/srcpkgs/base-system-live-busybox/template +++ b/srcpkgs/base-system-live-busybox/template @@ -1,13 +1,14 @@ # Build template for 'base-system-live-busybox'. pkgname=base-system-live-busybox version=1.20.2 -revision=1 +revision=2 wrksrc="busybox-${version}" homepage="http://www.busybox.net" distfiles="${homepage}/downloads/busybox-$version.tar.bz2" -makedepends="perl" +makedepends="perl pam-devel" replaces="base-busybox>=0" -conflicts="base-system>=0" +conflicts="base-system>=0 coreutils>=0 util-linux>=0" +provides="coreutils-${version} run-parts-${version} dosfstools-${version}" short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live" maintainer="Juan RP " license="GPL-2" @@ -37,6 +38,8 @@ do_install() { vmove "bin/*" usr/bin vmove "sbin/*" usr/sbin + chmod 4755 ${DESTDIR}/usr/bin/busybox + vinstall ${FILESDIR}/udhcpc@.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/udhcpc-default.script 755 usr/share/udhcpc default.script }