From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 20:48:02 +0000 (+0000)
Subject: [packages_10.03.2] ap51-flash: merge r29199, r29230
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c732660e9cc34997df7f7a05a6b79776ba6b5382;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] ap51-flash: merge r29199, r29230

SVN-Revision: 30135
---

diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile
index 60ac9ab049..ad8f129f9a 100644
--- a/utils/ap51-flash/Makefile
+++ b/utils/ap51-flash/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ap51-flash
 PKG_REV:=232
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -47,7 +47,11 @@ define Package/ap51-flash/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ap51-flash $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/ap51-flash.init $(1)/etc/init.d/ap51-flash
 	$(INSTALL_BIN) ./files/ap51-flash.sh $(1)/usr/lib/ap51-flash/ap51-flash.sh
-	$(INSTALL_DATA) ./files/ap51-flash.conf $(1)/etc/config/ap51-flash
+	$(INSTALL_DATA) ./files/ap51-flash.config $(1)/etc/config/ap51-flash
+endef
+
+define Package/ap51-flash/conffiles
+/etc/config/ap51-flash
 endef
 
 $(eval $(call BuildPackage,ap51-flash))
diff --git a/utils/ap51-flash/files/ap51-flash.conf b/utils/ap51-flash/files/ap51-flash.conf
deleted file mode 100644
index f66973f4b9..0000000000
--- a/utils/ap51-flash/files/ap51-flash.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#config flash
-#	option ifname	eth0.1
-#	option rootfs	/tmp/images/openwrt-atheros-root.squashfs
-#	option kernel	/tmp/images/openwrt-atheros-vmlinux.lzma
-#	option ubnt	/tmp/images/openwrt-atheros-ubnt5-squashfs.bin
-##	option loop	'1'
diff --git a/utils/ap51-flash/files/ap51-flash.config b/utils/ap51-flash/files/ap51-flash.config
new file mode 100644
index 0000000000..f66973f4b9
--- /dev/null
+++ b/utils/ap51-flash/files/ap51-flash.config
@@ -0,0 +1,6 @@
+#config flash
+#	option ifname	eth0.1
+#	option rootfs	/tmp/images/openwrt-atheros-root.squashfs
+#	option kernel	/tmp/images/openwrt-atheros-vmlinux.lzma
+#	option ubnt	/tmp/images/openwrt-atheros-ubnt5-squashfs.bin
+##	option loop	'1'