From: "Andreas Bießmann" <andreas@biessmann.de>
To: ptxdist@pengutronix.de
Cc: "Andreas Bießmann" <andreas@biessmann.de>
Subject: [ptxdist] [PATCH v2] scripts/migrate: use autotools to insert working sed
Date: Wed, 5 Oct 2011 18:54:26 +0200 [thread overview]
Message-ID: <1317833666-11917-1-git-send-email-andreas@biessmann.de> (raw)
In-Reply-To: <1317368037-22674-1-git-send-email-andreas@biessmann.de>
Some systems do not provide /bin/sed (e.g. OS X), use autotools to
insert working sed version in migration scripts.
Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
---
.gitignore | 3 +
Makefile.in | 2 +
configure.ac | 11 +++
scripts/migrate/migrate_platform | 19 -----
scripts/migrate/migrate_platform.in | 19 +++++
scripts/migrate/migrate_ptx | 147 -----------------------------------
scripts/migrate/migrate_ptx.in | 147 +++++++++++++++++++++++++++++++++++
7 files changed, 182 insertions(+), 166 deletions(-)
delete mode 100755 scripts/migrate/migrate_platform
create mode 100644 scripts/migrate/migrate_platform.in
delete mode 100755 scripts/migrate/migrate_ptx
create mode 100644 scripts/migrate/migrate_ptx.in
diff --git a/.gitignore b/.gitignore
index 2548524..28f0be0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ scripts/kconfig/zconf.hash.c
scripts/kconfig/zconf.tab.c
scripts/kconfig/*.o
scripts/kconfig/lxdialog/*.o
+
+scripts/migrate/migrate_platform
+scripts/migrate/migrate_ptx
diff --git a/Makefile.in b/Makefile.in
index 5ee1383..124dfde 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,6 +89,8 @@ dist: dirty-check
md5sum "${project}.tar.bz2" > "${project}.tar.bz2.md5"
distclean: clean
+ rm -fr scripts/migrate/migrate_platform
+ rm -fr scripts/migrate/migrate_ptx
rm -fr Makefile
rm -fr build-stamp
rm -fr config.log config.status autom4te.cache
diff --git a/configure.ac b/configure.ac
index 7a34e7a..44616df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,6 +420,17 @@ AC_MSG_RESULT([])
AC_CONFIG_FILES( \
Makefile \
)
+
+# preprocess some scripts to insert correct tools
+AC_CONFIG_FILES( \
+ [scripts/migrate/migrate_platform], \
+ [chmod +x scripts/migrate/migrate_platform] \
+)
+AC_CONFIG_FILES( \
+ [scripts/migrate/migrate_ptx], \
+ [chmod +x scripts/migrate/migrate_ptx] \
+)
+
AC_OUTPUT
AC_MSG_RESULT([])
diff --git a/scripts/migrate/migrate_platform b/scripts/migrate/migrate_platform
deleted file mode 100755
index 22a58e4..0000000
--- a/scripts/migrate/migrate_platform
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sed -f
-
-#
-# from : ptxdist-1.99.20
-# to : ptxdist-1.99.21
-# symbol : PTXCONF_COMPILER_PREFIX_UBOOT -> PTXCONF_COMPILER_PREFIX_BOOTLOADER
-# reason : more generic special compiler handling
-#
-s/^\(\(# \)\?PTXCONF\)_COMPILER_PREFIX_UBOOT\(.*$\)/\1_COMPILER_PREFIX_BOOTLOADER\3/
-
-#
-# from : ptxdist-2010.05.2
-# to : ptxdist-2010.06.0
-# symbol : IMAGE_UBI_VOLUME_SIZE -> IMAGE_UBI_ROOT_VOL_SIZE
-# symbol : IMAGE_UBIFS_MAX_LEB_COUNT -> IMAGE_UBIFS_ROOT_MAX_LEB_COUNT
-# reason : changes in ubi image generation, we are going to have more than one volumes
-#
-s/^\(\(# \)\?PTXCONF\)_IMAGE_UBI_VOLUME_SIZE\(.*$\)/\1_IMAGE_UBI_ROOT_VOL_SIZE\3/
-s/^\(\(# \)\?PTXCONF\)_IMAGE_UBIFS_MAX_LEB_COUNT\(.*$\)/\1_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT\3/
diff --git a/scripts/migrate/migrate_platform.in b/scripts/migrate/migrate_platform.in
new file mode 100644
index 0000000..39c44d7
--- /dev/null
+++ b/scripts/migrate/migrate_platform.in
@@ -0,0 +1,19 @@
+#!@SED@ -f
+
+#
+# from : ptxdist-1.99.20
+# to : ptxdist-1.99.21
+# symbol : PTXCONF_COMPILER_PREFIX_UBOOT -> PTXCONF_COMPILER_PREFIX_BOOTLOADER
+# reason : more generic special compiler handling
+#
+s/^\(\(# \)\?PTXCONF\)_COMPILER_PREFIX_UBOOT\(.*$\)/\1_COMPILER_PREFIX_BOOTLOADER\3/
+
+#
+# from : ptxdist-2010.05.2
+# to : ptxdist-2010.06.0
+# symbol : IMAGE_UBI_VOLUME_SIZE -> IMAGE_UBI_ROOT_VOL_SIZE
+# symbol : IMAGE_UBIFS_MAX_LEB_COUNT -> IMAGE_UBIFS_ROOT_MAX_LEB_COUNT
+# reason : changes in ubi image generation, we are going to have more than one volumes
+#
+s/^\(\(# \)\?PTXCONF\)_IMAGE_UBI_VOLUME_SIZE\(.*$\)/\1_IMAGE_UBI_ROOT_VOL_SIZE\3/
+s/^\(\(# \)\?PTXCONF\)_IMAGE_UBIFS_MAX_LEB_COUNT\(.*$\)/\1_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT\3/
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
deleted file mode 100755
index 896959a..0000000
--- a/scripts/migrate/migrate_ptx
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sed -f
-
-#
-# from : ptxdist-1.99.10
-# to : ptxdist-1.99.11
-# symbol : PTXCONF_BB_CONFIG_* -> PTXCONF_BUSYBOX_*
-# reason : consolidation of busybox config names
-#
-s/^\(\(# \)\?PTXCONF\)_BB_CONFIG_\(.*$\)/\1_BUSYBOX_\3/
-
-#
-# from : ptxdist-1.99.10
-# to : ptxdist-1.99.11
-# symbol : PTXCONF_BUSYBOX_FEATURE_GUNZIP_UNCOMPRESS -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_Z
-# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_GZIP -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_GZ
-# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_BZIP2 -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_BZ2
-# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_LZMA -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_LZMA
-# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_COMPRESS -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_Z
-# symbol : PTXCONF_BUSYBOX_FEATURE_DF_INODE -> PTXCONF_BUSYBOX_FEATURE_DF_FANCY
-# symbol : PTXCONF_BUSYBOX_FEATURE_UNARCHIVE_TAPE -> (gone)
-# symbol : PTXCONF_BUSYBOX_DEBUG_INIT -> (gone)
-# symbol : PTXCONF_BUSYBOX_FETCHMAIL -> (gone)
-# reason : update busybox: 1.10.4 -> 1.13.2
-#
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_GUNZIP_UNCOMPRESS\(.*$\)/\1_FEATURE_SEAMLESS_Z\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_GZIP\(.*$\)/\1_FEATURE_SEAMLESS_GZ\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_BZIP2\(.*$\)/\1_FEATURE_SEAMLESS_BZ2\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_LZMA\(.*$\)/\1_FEATURE_SEAMLESS_LZMA\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_COMPRESS\(.*$\)/\1_FEATURE_SEAMLESS_Z\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_DF_INODE\(.*$\)/\1_FEATURE_DF_FANCY\3/
-
-#
-# from : ptxdist-1.99.10
-# to : ptxdist-1.99.11
-# symbol : PTXCONF_ROOTFS_UDEV__DEFAULT_RULES -> PTXCONF_UDEV__DEFAULT_RULES
-# symbol : PTXCONF_ROOTFS_ETC_UDEV__CONF -> PTXCONF_UDEV__ETC_CONF
-#
-s/^\(\(# \)\?PTXCONF_\)ROOTFS_UDEV__DEFAULT_RULES\(.*$\)/\1UDEV__DEFAULT_RULES\3/
-s/^\(\(# \)\?PTXCONF_\)ROOTFS_ETC_UDEV__CONF\(.*$\)/\1UDEV__ETC_CONF\3/
-
-#
-# from : ptxdist-1.99.19
-# to : ptxdist-1.99.20
-# symbol : BUSYBOX_GETOPT_LONG -> BUSYBOX_LONG_OPTS
-# reason : update busybox 1.13.2 -> 1.15.2
-#
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_GETOPT_LONG\(.*$\)/\1_LONG_OPTS\3/
-
-#
-# from : ptxdist-2010.01.0
-# to : ptxdist-2010.02.0
-# symbol : BZIP2__* -> BZIP2_*
-# reason : cleanup
-#
-s/^\(\(# \)\?PTXCONF_BZIP2_\)_\(.*$\)/\1\3/
-
-#
-# from : ptxdist-2010.01.0
-# to : ptxdist-2010.02.0
-# symbol : UDEV__* -> UDEV_*
-# reason : cleanup
-#
-s/^\(\(# \)\?PTXCONF_UDEV_\)_\(.*$\)/\1\3/
-
-#
-# from : ptxdist-2010.03.0
-# to : ptxdist-2010.04.0
-# symbol : BUSYBOX_APP_DHCPRELAY -> BUSYBOX_DHCPRELAY
-# symbol : BUSYBOX_APP_DUMPLEASES -> BUSYBOX_DUMPLEASES
-# symbol : BUSYBOX_APP_UDHCPC -> BUSYBOX_UDHCPC
-# symbol : BUSYBOX_APP_UDHCPD -> BUSYBOX_UDHCPD
-# reason : update busybox 1.15.3-> 1.16.1
-#
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DHCPRELAY\(.*$\)/\1_DHCPRELAY\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DUMPLEASES\(.*$\)/\1_DUMPLEASES\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPC\(.*$\)/\1_UDHCPC\3/
-s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPD\(.*$\)/\1_UDHCPD\3/
-
-#
-# from : ptxdist-2010.04.0
-# to : ptxdist-2010.05.0
-# symbol : LIBPCRE__* -> LIBPCRE_
-# reason : consolidation of config symbols
-#
-s/^\(\(# \)\?PTXCONF_LIBPCRE_\)_\(.*$\)/\1\3/
-
-#
-# from : ptxdist-2010.04.0
-# to : ptxdist-2010.05.0
-# symbol : INETUTILS_SYSLOGD_STARTSRCIPT -> INETUTILS_SYSLOGD_STARTSCRIPT
-# reason : typo
-#
-s/^\(\(# \)\?PTXCONF_INETUTILS_SYSLOGD\)\(_STARTSRCIPT$\)/\1_STARTSCRIPT/
-
-#
-# from : ptxdist-2010.05.0
-# to : ptxdist-2010.06.0
-# symbol : GLIB__* -> GLIB_
-# reason : consolidation of config symbols
-#
-s/^\(\(# \)\?PTXCONF_GLIB_\)_\(.*$\)/\1\3/
-
-#
-# symbol : SUDO__SENDMAIL -> SUDO_USE_SENDMAIL
-# symbol : SUDO__ETC_SUDOERS -> SUDO_INSTALL_ETC_SUDOERS
-# reason : consolidation of config symbols
-#
-s/^\(\(# \)\?PTXCONF_SUDO_\)_\(SENDMAIL\)/\1USE_\3/
-s/^\(\(# \)\?PTXCONF_SUDO_\)_\(ETC_SUDOERS\)/\1INSTALL_\3/
-
-#
-# symbol : UDEV_EXTRA_MODEM_MODESWITCH -> UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
-# reason : upstream name changed
-#
-s/^\(\(# \)\?PTXCONF_UDEV_EXTRA_\)MODEM\(_MODESWITCH.*$\)/\1MOBILE_ACTION\3/
-
-#
-# symbol : INITMETHOD_BBINIT_LINK_* -> *_BBINIT_LINK
-# reason : move rc.d links to the package with the init script
-#
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_ACPID/\1ACPID_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(INETD\|SYSLOGD\)\(.*\)$/\1BUSYBOX_\3_BBINIT_LINK\4\n\1INETUTILS_\3_BBINIT_LINK\4/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NFSD/\1NFSUTILS_NFSD_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NTP\>/\1NTP_NTPD_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NTPC\>/\1NTP_NTPC_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_RSYNCD\(.*\)$/\1RSYNC_BBINIT_LINK\3\n\1RSYNC3_BBINIT_LINK\3/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_SMARTD/\1SMARTMONTOOLS_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_SYSLOG_NG/\1SYSLOGNG_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_TELNETD\(.*\)$/\1UTELNETD_BBINIT_LINK\3\n\1BUSYBOX_TELNETD_BBINIT_LINK\3/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(CROND\|HWCLOCK\|TELNETD\)/\1BUSYBOX_\3_BBINIT_LINK/
-s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(ALSA_UTILS\|APACHE2\|AT\|CHRONY\|CONNMAN\|CVS\|DBUS\|DIBBLER_[A-Z]*\|DNSMASQ\|DROPBEAR\|FAKE_OVERLAYFS\|LIGHTTPD\|LVM2\|MYSQL\|NTPCLIENT\|OPENSSH\|PORTMAP\|PPPD\|PROFTPD\|PUREFTPD\|RC_ONCE\|SAMBA\|SPLASHUTILS\|THTTPD\|UDEV\)/\1\3_BBINIT_LINK/
-
-#
-# symbol : PTXCONF_BLUEZ_LIBS -> PTXCONF_BLUEZ
-# reason : upstream merged bluez-libs + bluez-utils -> bluez
-# PTXCONF_BLUEZ_UTILS is unchanged
-#
-s/^\(\(# \)\?PTXCONF_BLUEZ\)_LIBS/\1/
-
-#
-# from : ptxdist-2011.01.0
-# to : ptxdist-2011.02.0
-# symbol : OWFS__* -> OWFS_
-# reason : consolidation of config symbols
-#
-s/^\(\(# \)\?PTXCONF_OWFS_\)_\(.*$\)/\1\3/
-
diff --git a/scripts/migrate/migrate_ptx.in b/scripts/migrate/migrate_ptx.in
new file mode 100644
index 0000000..157403a
--- /dev/null
+++ b/scripts/migrate/migrate_ptx.in
@@ -0,0 +1,147 @@
+#!@SED@ -f
+
+#
+# from : ptxdist-1.99.10
+# to : ptxdist-1.99.11
+# symbol : PTXCONF_BB_CONFIG_* -> PTXCONF_BUSYBOX_*
+# reason : consolidation of busybox config names
+#
+s/^\(\(# \)\?PTXCONF\)_BB_CONFIG_\(.*$\)/\1_BUSYBOX_\3/
+
+#
+# from : ptxdist-1.99.10
+# to : ptxdist-1.99.11
+# symbol : PTXCONF_BUSYBOX_FEATURE_GUNZIP_UNCOMPRESS -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_Z
+# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_GZIP -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_GZ
+# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_BZIP2 -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_BZ2
+# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_LZMA -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_LZMA
+# symbol : PTXCONF_BUSYBOX_FEATURE_TAR_COMPRESS -> PTXCONF_BUSYBOX_FEATURE_SEAMLESS_Z
+# symbol : PTXCONF_BUSYBOX_FEATURE_DF_INODE -> PTXCONF_BUSYBOX_FEATURE_DF_FANCY
+# symbol : PTXCONF_BUSYBOX_FEATURE_UNARCHIVE_TAPE -> (gone)
+# symbol : PTXCONF_BUSYBOX_DEBUG_INIT -> (gone)
+# symbol : PTXCONF_BUSYBOX_FETCHMAIL -> (gone)
+# reason : update busybox: 1.10.4 -> 1.13.2
+#
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_GUNZIP_UNCOMPRESS\(.*$\)/\1_FEATURE_SEAMLESS_Z\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_GZIP\(.*$\)/\1_FEATURE_SEAMLESS_GZ\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_BZIP2\(.*$\)/\1_FEATURE_SEAMLESS_BZ2\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_LZMA\(.*$\)/\1_FEATURE_SEAMLESS_LZMA\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_TAR_COMPRESS\(.*$\)/\1_FEATURE_SEAMLESS_Z\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_FEATURE_DF_INODE\(.*$\)/\1_FEATURE_DF_FANCY\3/
+
+#
+# from : ptxdist-1.99.10
+# to : ptxdist-1.99.11
+# symbol : PTXCONF_ROOTFS_UDEV__DEFAULT_RULES -> PTXCONF_UDEV__DEFAULT_RULES
+# symbol : PTXCONF_ROOTFS_ETC_UDEV__CONF -> PTXCONF_UDEV__ETC_CONF
+#
+s/^\(\(# \)\?PTXCONF_\)ROOTFS_UDEV__DEFAULT_RULES\(.*$\)/\1UDEV__DEFAULT_RULES\3/
+s/^\(\(# \)\?PTXCONF_\)ROOTFS_ETC_UDEV__CONF\(.*$\)/\1UDEV__ETC_CONF\3/
+
+#
+# from : ptxdist-1.99.19
+# to : ptxdist-1.99.20
+# symbol : BUSYBOX_GETOPT_LONG -> BUSYBOX_LONG_OPTS
+# reason : update busybox 1.13.2 -> 1.15.2
+#
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_GETOPT_LONG\(.*$\)/\1_LONG_OPTS\3/
+
+#
+# from : ptxdist-2010.01.0
+# to : ptxdist-2010.02.0
+# symbol : BZIP2__* -> BZIP2_*
+# reason : cleanup
+#
+s/^\(\(# \)\?PTXCONF_BZIP2_\)_\(.*$\)/\1\3/
+
+#
+# from : ptxdist-2010.01.0
+# to : ptxdist-2010.02.0
+# symbol : UDEV__* -> UDEV_*
+# reason : cleanup
+#
+s/^\(\(# \)\?PTXCONF_UDEV_\)_\(.*$\)/\1\3/
+
+#
+# from : ptxdist-2010.03.0
+# to : ptxdist-2010.04.0
+# symbol : BUSYBOX_APP_DHCPRELAY -> BUSYBOX_DHCPRELAY
+# symbol : BUSYBOX_APP_DUMPLEASES -> BUSYBOX_DUMPLEASES
+# symbol : BUSYBOX_APP_UDHCPC -> BUSYBOX_UDHCPC
+# symbol : BUSYBOX_APP_UDHCPD -> BUSYBOX_UDHCPD
+# reason : update busybox 1.15.3-> 1.16.1
+#
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DHCPRELAY\(.*$\)/\1_DHCPRELAY\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DUMPLEASES\(.*$\)/\1_DUMPLEASES\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPC\(.*$\)/\1_UDHCPC\3/
+s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPD\(.*$\)/\1_UDHCPD\3/
+
+#
+# from : ptxdist-2010.04.0
+# to : ptxdist-2010.05.0
+# symbol : LIBPCRE__* -> LIBPCRE_
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_LIBPCRE_\)_\(.*$\)/\1\3/
+
+#
+# from : ptxdist-2010.04.0
+# to : ptxdist-2010.05.0
+# symbol : INETUTILS_SYSLOGD_STARTSRCIPT -> INETUTILS_SYSLOGD_STARTSCRIPT
+# reason : typo
+#
+s/^\(\(# \)\?PTXCONF_INETUTILS_SYSLOGD\)\(_STARTSRCIPT$\)/\1_STARTSCRIPT/
+
+#
+# from : ptxdist-2010.05.0
+# to : ptxdist-2010.06.0
+# symbol : GLIB__* -> GLIB_
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_GLIB_\)_\(.*$\)/\1\3/
+
+#
+# symbol : SUDO__SENDMAIL -> SUDO_USE_SENDMAIL
+# symbol : SUDO__ETC_SUDOERS -> SUDO_INSTALL_ETC_SUDOERS
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_SUDO_\)_\(SENDMAIL\)/\1USE_\3/
+s/^\(\(# \)\?PTXCONF_SUDO_\)_\(ETC_SUDOERS\)/\1INSTALL_\3/
+
+#
+# symbol : UDEV_EXTRA_MODEM_MODESWITCH -> UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
+# reason : upstream name changed
+#
+s/^\(\(# \)\?PTXCONF_UDEV_EXTRA_\)MODEM\(_MODESWITCH.*$\)/\1MOBILE_ACTION\3/
+
+#
+# symbol : INITMETHOD_BBINIT_LINK_* -> *_BBINIT_LINK
+# reason : move rc.d links to the package with the init script
+#
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_ACPID/\1ACPID_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(INETD\|SYSLOGD\)\(.*\)$/\1BUSYBOX_\3_BBINIT_LINK\4\n\1INETUTILS_\3_BBINIT_LINK\4/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NFSD/\1NFSUTILS_NFSD_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NTP\>/\1NTP_NTPD_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_NTPC\>/\1NTP_NTPC_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_RSYNCD\(.*\)$/\1RSYNC_BBINIT_LINK\3\n\1RSYNC3_BBINIT_LINK\3/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_SMARTD/\1SMARTMONTOOLS_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_SYSLOG_NG/\1SYSLOGNG_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_TELNETD\(.*\)$/\1UTELNETD_BBINIT_LINK\3\n\1BUSYBOX_TELNETD_BBINIT_LINK\3/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(CROND\|HWCLOCK\|TELNETD\)/\1BUSYBOX_\3_BBINIT_LINK/
+s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(ALSA_UTILS\|APACHE2\|AT\|CHRONY\|CONNMAN\|CVS\|DBUS\|DIBBLER_[A-Z]*\|DNSMASQ\|DROPBEAR\|FAKE_OVERLAYFS\|LIGHTTPD\|LVM2\|MYSQL\|NTPCLIENT\|OPENSSH\|PORTMAP\|PPPD\|PROFTPD\|PUREFTPD\|RC_ONCE\|SAMBA\|SPLASHUTILS\|THTTPD\|UDEV\)/\1\3_BBINIT_LINK/
+
+#
+# symbol : PTXCONF_BLUEZ_LIBS -> PTXCONF_BLUEZ
+# reason : upstream merged bluez-libs + bluez-utils -> bluez
+# PTXCONF_BLUEZ_UTILS is unchanged
+#
+s/^\(\(# \)\?PTXCONF_BLUEZ\)_LIBS/\1/
+
+#
+# from : ptxdist-2011.01.0
+# to : ptxdist-2011.02.0
+# symbol : OWFS__* -> OWFS_
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_OWFS_\)_\(.*$\)/\1\3/
+
--
1.7.6.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-05 16:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 7:33 [ptxdist] [PATCH] scripts/migrate: use env to find sed Andreas Bießmann
2011-10-04 13:26 ` Michael Olbrich
2011-10-05 16:54 ` Andreas Bießmann [this message]
2011-10-10 16:04 ` [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_* Michael Olbrich
2011-10-11 10:16 ` andreas
2011-10-14 14:04 ` Michael Olbrich
2011-10-14 15:03 ` Bernhard Walle
2011-10-17 7:06 ` Andreas Bießmann
2011-10-17 10:45 ` Bernhard Walle
2011-10-17 12:53 ` Michael Olbrich
2011-10-17 6:54 ` Andreas Bießmann
2011-10-17 7:10 ` Andreas Bießmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317833666-11917-1-git-send-email-andreas@biessmann.de \
--to=andreas@biessmann.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox