diff options
| -rw-r--r-- | include/package-ipkg.mk | 17 | ||||
| -rw-r--r-- | package/Makefile | 3 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 77 |
3 files changed, 92 insertions, 5 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 1caeaa25b6..494444613a 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -16,7 +16,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg define BuildIPKGVariable ifdef Package/$(1)/$(2) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2)$(3); endif endef @@ -117,8 +117,8 @@ ifeq ($(DUMP),) $(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),preinst)) - $(eval $(call BuildIPKGVariable,$(1),postinst)) - $(eval $(call BuildIPKGVariable,$(1),prerm)) + $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg)) + $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg)) $(eval $(call BuildIPKGVariable,$(1),postrm)) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) @@ -174,6 +174,17 @@ ifeq ($(DUMP),) echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ ) > $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control + ( \ + echo "#!/bin/sh"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo "default_postinst \$$$$0 \$$$$@"; \ + ) > $$(IDIR_$(1))/CONTROL/postinst + ( \ + echo "#!/bin/sh"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo "default_prerm \$$$$0 \$$$$@"; \ + ) > $$(IDIR_$(1))/CONTROL/prerm + chmod 0755 $$(IDIR_$(1))/CONTROL/prerm $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ ) diff --git a/package/Makefile b/package/Makefile index 0cba878576..a42b4b0dd0 100644 --- a/package/Makefile +++ b/package/Makefile @@ -116,7 +116,8 @@ $(curdir)/install: $(TMP_DIR)/.build @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f - rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst + rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst* + rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm* $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) $(call mklibs) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 0d4b2a33db..67f4a046e5 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -160,6 +160,50 @@ insert_modules() { } } +default_prerm() { + local name + name=$(echo $(basename $1) | cut -d. -f1) + [ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg + for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do + $i disable + $i stop + done +} + +default_postinst() { + local name rusers + name=$(echo $(basename $1) | cut -d. -f1) + [ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg ] && . ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg + rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.control) + [ -n "$rusers" ] && { + local user group + for a in $(echo $rusers | sed "s/Require-User://g"); do + user="" + group="" + for b in $(echo $a | sed "s/:/ /g"); do + [ -z "$user" ] && { + user=$b + continue + } + [ -z "$group" ] && { + group=$b + group_add_next $b + gid=$? + user_exists $user || user_add $user "" $gid + continue + } + group_add_next $b + group_add_user $b $user + done + done + } + [ -n "${IPKG_INSTROOT}" -o "$PKG_UPGRADE" = "1" ] || for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do + $i enable + $i start + done + return 0 +} + include() { local file @@ -199,14 +243,45 @@ group_exists() { grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/group } +group_add_next() { + local gid gids + gid=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group | cut -d: -f3) + [ -n "$gid" ] && return $gid + gids=$(cat ${IPKG_INSTROOT}/etc/group | cut -d: -f3) + gid=100 + while [ -n "$(echo $gids | grep $gid)" ] ; do + gid=$((gid + 1)) + done + group_add $1 $gid + return $gid +} + +group_add_user() { + local grp delim="," + grp=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group) + [ -z "$(echo $grp | cut -d: -f4 | grep $2)" ] || return + [ -n "$(echo $grp | grep ":$")" ] && delim="" + [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd + sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group + [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd +} + user_add() { local name="${1}" local uid="${2}" - local gid="${3:-$2}" + local gid="${3}" local desc="${4:-$1}" local home="${5:-/var/run/$1}" local shell="${6:-/bin/false}" local rc + [ -z "$uid" ] && { + uids=$(cat ${IPKG_INSTROOT}/etc/passwd | cut -d: -f3) + uid=100 + while [ -n "$(echo $uids | grep $uid)" ] ; do + uid=$((uid + 1)) + done + } + [ -z "$gid" ] && gid=$uid [ -f "${IPKG_INSTROOT}/etc/passwd" ] || return 1 [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd echo "${name}:x:${uid}:${gid}:${desc}:${home}:${shell}" >> ${IPKG_INSTROOT}/etc/passwd |