diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/Depends.mk | 2 | ||||
-rw-r--r-- | package/cfinstall/Config.in | 5 | ||||
-rw-r--r-- | package/cfinstall/Makefile | 2 | ||||
-rw-r--r-- | package/cfinstall/src/cfinstall (renamed from package/cfinstall/src/cfinstall.sh) | 0 | ||||
-rw-r--r-- | package/lvm/Makefile | 3 | ||||
-rw-r--r-- | package/parted/Config.in | 2 | ||||
-rw-r--r-- | package/parted/Makefile | 2 |
7 files changed, 11 insertions, 5 deletions
diff --git a/package/Depends.mk b/package/Depends.mk index 7f455a4fe..732296f0a 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -181,7 +181,7 @@ openswan-compile: gmp-compile oprofile-compile: popt-compile osiris-compile: openssl-compile palantir-compile: jpeg-compile -parted-compile: e2fsprogs-compile +parted-compile: e2fsprogs-compile lvm-compile readline-compile pciutils-compile: zlib-compile popt-compile: libiconv-compile ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in index e553d2f77..2777b80e6 100644 --- a/package/cfinstall/Config.in +++ b/package/cfinstall/Config.in @@ -4,7 +4,10 @@ config ADK_PACKAGE_CFINSTALL select ADK_PACKAGE_SFDISK select ADK_PACKAGE_PARTED select ADK_PACKAGE_GRUB_BIN - depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532 + depends on \ + ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ + ADK_LINUX_MIPS_RB532 default n help Installs a rootfs tar archive onto a Compact Flash disk. diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile index 7f10dba27..b48120005 100644 --- a/package/cfinstall/Makefile +++ b/package/cfinstall/Makefile @@ -24,6 +24,6 @@ pre-configure: do-install: ${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin - ${INSTALL_BIN} ./src/cfinstall.sh $(IDIR_CFINSTALL)/sbin + ${INSTALL_BIN} ./src/cfinstall $(IDIR_CFINSTALL)/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfinstall/src/cfinstall.sh b/package/cfinstall/src/cfinstall index 1ff908963..1ff908963 100644 --- a/package/cfinstall/src/cfinstall.sh +++ b/package/cfinstall/src/cfinstall diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 90c7f6405..6c73678a0 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -13,13 +13,14 @@ PKG_DEPENDS:= device-mapper libncurses PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ +PKG_DESCR_DM:= device-mapper library and utility DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-user="" --with-group="" \ diff --git a/package/parted/Config.in b/package/parted/Config.in index 05b8974be..04ace5a2b 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -3,5 +3,7 @@ config ADK_PACKAGE_PARTED tristate default n select ADK_PACKAGE_LIBUUID + select ADK_PACKAGE_DEVICE_MAPPER + select ADK_PACKAGE_LIBREADLINE help GNU parted. diff --git a/package/parted/Makefile b/package/parted/Makefile index 153f88c71..63a83105d 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted -PKG_DEPENDS:= libuuid +PKG_DEPENDS:= libuuid libreadline device-mapper PKG_SECTION:= admin PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} |