Changeset 23295 for branches/backfire


Ignore:
Timestamp:
2010-10-07T17:06:15+02:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r23256, r23257 and r23258

Location:
branches/backfire
Files:
3 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/backfire/include/package-ipkg.mk

    r23223 r23295  
    5050    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) 
    5151    INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list 
     52    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles)) 
    5253 
    5354    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT)) 
     
    116117        SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \ 
    117118        $(SED) "s|^\(Installed-Size:\).*|\1 $$$$SIZE|g" $$(IDIR_$(1))/CONTROL/control 
     119 
     120    ifneq ($$(KEEP_$(1)),) 
     121                @( \ 
     122                        keepfiles=""; \ 
     123                        for x in $$(KEEP_$(1)); do \ 
     124                                [ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \ 
     125                        done; \ 
     126                        [ -z "$keepfiles" ] || { \ 
     127                                mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \ 
     128                                for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \ 
     129                        }; \ 
     130                ) 
     131    endif 
     132 
    118133        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) 
    119134        @[ -f $$(IPKG_$(1)) ] || false  
  • branches/backfire/package/base-files/Makefile

    r23280 r23295  
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=43.7 
     13PKG_RELEASE:=43.8 
    1414 
    1515PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
     
    5555/etc/sysctl.conf 
    5656/etc/rc.local 
     57/etc/config/ 
     58/etc/dropbear/ 
    5759$(call $(TARGET)/conffiles) 
    5860endef 
  • branches/backfire/package/base-files/files/sbin/sysupgrade

    r23236 r23295  
    5252add_uci_conffiles() { 
    5353        local file="$1" 
    54         ( find /etc/config /etc/passwd /etc/group /etc/dropbear \ 
    55                 /etc/firewall.user /etc/rc.local -type f; 
     54        ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ 
     55                /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ 
     56                -type f 2>/dev/null; 
    5657          opkg list-changed-conffiles ) | sort -u > "$file" 
    5758        return 0 
Note: See TracChangeset for help on using the changeset viewer.